From 526a36ca2415e66a8b1b7b0d596fab26d8e18724 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 29 Aug 2017 14:20:59 +0900 Subject: [PATCH] HAL interface libs for testing are built w/o VNDK. The HAL interfaces for testing were copied to /system/lib[64]/vndk directory since they are built as cc_library and thus falsely recognized as members of VNDK, which isn't true. Build them as non-VNDK so that they are filtered out. To do so, .hidl_for_test files are added for the test HALs and update-makefiles.sh were ran. Bug: 64776708 Test: no android.hardware.tests.*.so file in /system/lib[64]/vndk on 2017 pixel devices Change-Id: I6167da8572081adfb53f432b248ac3bbee39dc42 --- tests/bar/1.0/.hidl_for_test | 0 tests/bar/1.0/Android.bp | 3 --- tests/baz/1.0/.hidl_for_test | 0 tests/baz/1.0/Android.bp | 3 --- tests/expression/1.0/.hidl_for_test | 0 tests/expression/1.0/Android.bp | 3 --- tests/extension/light/2.0/.hidl_for_test | 0 tests/extension/light/2.0/Android.bp | 3 --- tests/foo/1.0/.hidl_for_test | 0 tests/foo/1.0/Android.bp | 3 --- tests/hash/1.0/.hidl_for_test | 0 tests/hash/1.0/Android.bp | 3 --- tests/inheritance/1.0/.hidl_for_test | 0 tests/inheritance/1.0/Android.bp | 3 --- tests/libhwbinder/1.0/.hidl_for_test | 0 tests/libhwbinder/1.0/Android.bp | 3 --- tests/libhwbinder/aidl/.hidl_for_test | 0 tests/memory/1.0/.hidl_for_test | 0 tests/memory/1.0/Android.bp | 3 --- tests/msgq/1.0/.hidl_for_test | 0 tests/msgq/1.0/Android.bp | 3 --- tests/multithread/1.0/.hidl_for_test | 0 tests/multithread/1.0/Android.bp | 3 --- tests/pointer/1.0/.hidl_for_test | 0 tests/pointer/1.0/Android.bp | 3 --- 25 files changed, 36 deletions(-) create mode 100644 tests/bar/1.0/.hidl_for_test create mode 100644 tests/baz/1.0/.hidl_for_test create mode 100644 tests/expression/1.0/.hidl_for_test create mode 100644 tests/extension/light/2.0/.hidl_for_test create mode 100644 tests/foo/1.0/.hidl_for_test create mode 100644 tests/hash/1.0/.hidl_for_test create mode 100644 tests/inheritance/1.0/.hidl_for_test create mode 100644 tests/libhwbinder/1.0/.hidl_for_test create mode 100644 tests/libhwbinder/aidl/.hidl_for_test create mode 100644 tests/memory/1.0/.hidl_for_test create mode 100644 tests/msgq/1.0/.hidl_for_test create mode 100644 tests/multithread/1.0/.hidl_for_test create mode 100644 tests/pointer/1.0/.hidl_for_test diff --git a/tests/bar/1.0/.hidl_for_test b/tests/bar/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/bar/1.0/Android.bp b/tests/bar/1.0/Android.bp index 2dbfb0f980..b6ee0423a7 100644 --- a/tests/bar/1.0/Android.bp +++ b/tests/bar/1.0/Android.bp @@ -74,9 +74,6 @@ cc_library { generated_headers: ["android.hardware.tests.bar@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.bar@1.0_genc++_headers"], vendor_available: true, - vndk: { - enabled: true, - }, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/tests/baz/1.0/.hidl_for_test b/tests/baz/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/baz/1.0/Android.bp b/tests/baz/1.0/Android.bp index cec3039952..ef68149984 100644 --- a/tests/baz/1.0/Android.bp +++ b/tests/baz/1.0/Android.bp @@ -67,9 +67,6 @@ cc_library { generated_headers: ["android.hardware.tests.baz@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.baz@1.0_genc++_headers"], vendor_available: true, - vndk: { - enabled: true, - }, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/tests/expression/1.0/.hidl_for_test b/tests/expression/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expression/1.0/Android.bp b/tests/expression/1.0/Android.bp index 093b6607f9..bc389b0a65 100644 --- a/tests/expression/1.0/Android.bp +++ b/tests/expression/1.0/Android.bp @@ -49,9 +49,6 @@ cc_library { generated_headers: ["android.hardware.tests.expression@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.expression@1.0_genc++_headers"], vendor_available: true, - vndk: { - enabled: true, - }, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/tests/extension/light/2.0/.hidl_for_test b/tests/extension/light/2.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/extension/light/2.0/Android.bp b/tests/extension/light/2.0/Android.bp index 52117b41e0..c5987a77c3 100644 --- a/tests/extension/light/2.0/Android.bp +++ b/tests/extension/light/2.0/Android.bp @@ -46,9 +46,6 @@ cc_library { generated_headers: ["android.hardware.tests.extension.light@2.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.extension.light@2.0_genc++_headers"], vendor_available: true, - vndk: { - enabled: true, - }, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/tests/foo/1.0/.hidl_for_test b/tests/foo/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/foo/1.0/Android.bp b/tests/foo/1.0/Android.bp index d0038ab72e..638795046a 100644 --- a/tests/foo/1.0/Android.bp +++ b/tests/foo/1.0/Android.bp @@ -74,9 +74,6 @@ cc_library { generated_headers: ["android.hardware.tests.foo@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.foo@1.0_genc++_headers"], vendor_available: true, - vndk: { - enabled: true, - }, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/tests/hash/1.0/.hidl_for_test b/tests/hash/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/hash/1.0/Android.bp b/tests/hash/1.0/Android.bp index 336963e3fc..505a4ad553 100644 --- a/tests/hash/1.0/Android.bp +++ b/tests/hash/1.0/Android.bp @@ -42,9 +42,6 @@ cc_library { generated_headers: ["android.hardware.tests.hash@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.hash@1.0_genc++_headers"], vendor_available: true, - vndk: { - enabled: true, - }, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/tests/inheritance/1.0/.hidl_for_test b/tests/inheritance/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/inheritance/1.0/Android.bp b/tests/inheritance/1.0/Android.bp index a8c0e6ce38..5d8d53de20 100644 --- a/tests/inheritance/1.0/Android.bp +++ b/tests/inheritance/1.0/Android.bp @@ -63,9 +63,6 @@ cc_library { generated_headers: ["android.hardware.tests.inheritance@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.inheritance@1.0_genc++_headers"], vendor_available: true, - vndk: { - enabled: true, - }, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/tests/libhwbinder/1.0/.hidl_for_test b/tests/libhwbinder/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/libhwbinder/1.0/Android.bp b/tests/libhwbinder/1.0/Android.bp index 61326286a7..338a72b1d7 100644 --- a/tests/libhwbinder/1.0/Android.bp +++ b/tests/libhwbinder/1.0/Android.bp @@ -49,9 +49,6 @@ cc_library { generated_headers: ["android.hardware.tests.libhwbinder@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.libhwbinder@1.0_genc++_headers"], vendor_available: true, - vndk: { - enabled: true, - }, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/tests/libhwbinder/aidl/.hidl_for_test b/tests/libhwbinder/aidl/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/memory/1.0/.hidl_for_test b/tests/memory/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/memory/1.0/Android.bp b/tests/memory/1.0/Android.bp index c5cc4a0c60..a7538240b2 100644 --- a/tests/memory/1.0/Android.bp +++ b/tests/memory/1.0/Android.bp @@ -42,9 +42,6 @@ cc_library { generated_headers: ["android.hardware.tests.memory@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.memory@1.0_genc++_headers"], vendor_available: true, - vndk: { - enabled: true, - }, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/tests/msgq/1.0/.hidl_for_test b/tests/msgq/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/msgq/1.0/Android.bp b/tests/msgq/1.0/Android.bp index 017e0d4a9d..0937545983 100644 --- a/tests/msgq/1.0/Android.bp +++ b/tests/msgq/1.0/Android.bp @@ -49,9 +49,6 @@ cc_library { generated_headers: ["android.hardware.tests.msgq@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.msgq@1.0_genc++_headers"], vendor_available: true, - vndk: { - enabled: true, - }, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/tests/multithread/1.0/.hidl_for_test b/tests/multithread/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/multithread/1.0/Android.bp b/tests/multithread/1.0/Android.bp index 68c19aa19f..5f4c44c980 100644 --- a/tests/multithread/1.0/Android.bp +++ b/tests/multithread/1.0/Android.bp @@ -42,9 +42,6 @@ cc_library { generated_headers: ["android.hardware.tests.multithread@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.multithread@1.0_genc++_headers"], vendor_available: true, - vndk: { - enabled: true, - }, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/tests/pointer/1.0/.hidl_for_test b/tests/pointer/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/pointer/1.0/Android.bp b/tests/pointer/1.0/Android.bp index 55598cacfd..a765ae76d6 100644 --- a/tests/pointer/1.0/Android.bp +++ b/tests/pointer/1.0/Android.bp @@ -49,9 +49,6 @@ cc_library { generated_headers: ["android.hardware.tests.pointer@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.pointer@1.0_genc++_headers"], vendor_available: true, - vndk: { - enabled: true, - }, shared_libs: [ "libhidlbase", "libhidltransport",