From 38a78e1fa9c6ee330c5db33d220b0f6bffa7b265 Mon Sep 17 00:00:00 2001 From: Zhuoyao Zhang Date: Tue, 10 Oct 2017 17:53:09 -0700 Subject: [PATCH] Static link test lib shims with test -impl libs. * So that vts no longer needs to push the shim libs in hidl test. Bug: 67500459 Test: make vts vts-tradefed run vts -m VtsHidlUnitTest Change-Id: I52ad066370f08a461b848d7d96dc4a659eb2da4d --- tests/bar/1.0/default/Android.bp | 9 +++++++-- tests/baz/1.0/default/Android.bp | 10 ++++++++-- tests/foo/1.0/default/Android.bp | 10 +++++++--- tests/foo/1.0/default/lib/Android.bp | 8 ++++++-- tests/hash/1.0/default/Android.bp | 10 ++++++++-- tests/inheritance/1.0/default/Android.bp | 9 +++++++-- tests/memory/1.0/default/Android.bp | 9 +++++++-- tests/multithread/1.0/default/Android.bp | 9 +++++++-- tests/pointer/1.0/default/Android.bp | 9 +++++++-- tests/pointer/1.0/default/lib/Android.bp | 5 +++-- tests/trie/1.0/default/Android.bp | 9 +++++++-- 11 files changed, 74 insertions(+), 23 deletions(-) diff --git a/tests/bar/1.0/default/Android.bp b/tests/bar/1.0/default/Android.bp index 82d34a95cc..8aa6135fa2 100644 --- a/tests/bar/1.0/default/Android.bp +++ b/tests/bar/1.0/default/Android.bp @@ -1,6 +1,6 @@ -cc_library_shared { +cc_library { name: "android.hardware.tests.bar@1.0-impl", defaults: ["hidl_defaults"], relative_install_path: "hw", @@ -14,10 +14,15 @@ cc_library_shared { "libcutils", "libhidlbase", "libhidltransport", + "libhwbinder", "liblog", "libutils", + ], + + // These are static libs only for testing purposes and portability. Shared + // libs should be used on device. + static_libs: [ "android.hardware.tests.foo@1.0", "android.hardware.tests.bar@1.0", ], - } diff --git a/tests/baz/1.0/default/Android.bp b/tests/baz/1.0/default/Android.bp index f247b83788..492e0b4ae3 100644 --- a/tests/baz/1.0/default/Android.bp +++ b/tests/baz/1.0/default/Android.bp @@ -1,4 +1,4 @@ -cc_library_shared { +cc_library { name: "android.hardware.tests.baz@1.0-impl", defaults: ["hidl_defaults"], relative_install_path: "hw", @@ -7,9 +7,15 @@ cc_library_shared { ], shared_libs: [ "libbase", + "libcutils", "libhidlbase", "libhidltransport", + "libhwbinder", + "liblog", "libutils", - "android.hardware.tests.baz@1.0", ], + + // These are static libs only for testing purposes and portability. Shared + // libs should be used on device. + static_libs: ["android.hardware.tests.baz@1.0"], } diff --git a/tests/foo/1.0/default/Android.bp b/tests/foo/1.0/default/Android.bp index 0e1d34d355..d9dfc69266 100644 --- a/tests/foo/1.0/default/Android.bp +++ b/tests/foo/1.0/default/Android.bp @@ -1,6 +1,6 @@ -cc_library_shared { +cc_library { name: "android.hardware.tests.foo@1.0-impl", defaults: ["hidl_defaults"], relative_install_path: "hw", @@ -11,12 +11,16 @@ cc_library_shared { shared_libs: [ "libbase", "libcutils", + "libfootest", "libhidlbase", "libhidltransport", - "libfootest", + "libhwbinder", "liblog", "libutils", - "android.hardware.tests.foo@1.0", ], + // These are static libs only for testing purposes and portability. Shared + // libs should be used on device. + static_libs: ["android.hardware.tests.foo@1.0"], + } diff --git a/tests/foo/1.0/default/lib/Android.bp b/tests/foo/1.0/default/lib/Android.bp index 895582c583..2cc96c5510 100644 --- a/tests/foo/1.0/default/lib/Android.bp +++ b/tests/foo/1.0/default/lib/Android.bp @@ -1,4 +1,4 @@ -cc_library_shared { +cc_library { name: "libfootest", defaults: ["hidl_defaults"], srcs: [ @@ -6,10 +6,14 @@ cc_library_shared { ], shared_libs: [ + "libcutils", "libhidlbase", "libhidltransport", - "android.hardware.tests.foo@1.0", + "libhwbinder", + "liblog", ], + static_libs: ["android.hardware.tests.foo@1.0"], + local_include_dirs: ["include/hidl-test"], export_include_dirs: ["include"], diff --git a/tests/hash/1.0/default/Android.bp b/tests/hash/1.0/default/Android.bp index 67f90977d6..6e6d6a8e36 100644 --- a/tests/hash/1.0/default/Android.bp +++ b/tests/hash/1.0/default/Android.bp @@ -1,4 +1,4 @@ -cc_library_shared { +cc_library { name: "android.hardware.tests.hash@1.0-impl", defaults: ["hidl_defaults"], relative_install_path: "hw", @@ -6,9 +6,15 @@ cc_library_shared { "Hash.cpp", ], shared_libs: [ + "libcutils", "libhidlbase", "libhidltransport", + "libhwbinder", + "liblog", "libutils", - "android.hardware.tests.hash@1.0", ], + + // These are static libs only for testing purposes and portability. Shared + // libs should be used on device. + static_libs: ["android.hardware.tests.hash@1.0"], } diff --git a/tests/inheritance/1.0/default/Android.bp b/tests/inheritance/1.0/default/Android.bp index 158da4b123..891355b339 100644 --- a/tests/inheritance/1.0/default/Android.bp +++ b/tests/inheritance/1.0/default/Android.bp @@ -1,6 +1,6 @@ -cc_library_shared { +cc_library { name: "android.hardware.tests.inheritance@1.0-impl", defaults: ["hidl_defaults"], relative_install_path: "hw", @@ -12,11 +12,16 @@ cc_library_shared { shared_libs: [ "libbase", + "libcutils", "libhidlbase", "libhidltransport", + "libhwbinder", "liblog", "libutils", - "android.hardware.tests.inheritance@1.0", ], + // These are static libs only for testing purposes and portability. Shared + // libs should be used on device. + static_libs: ["android.hardware.tests.inheritance@1.0"], + } diff --git a/tests/memory/1.0/default/Android.bp b/tests/memory/1.0/default/Android.bp index efd4165089..985183bc02 100644 --- a/tests/memory/1.0/default/Android.bp +++ b/tests/memory/1.0/default/Android.bp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -cc_library_shared { +cc_library { name: "android.hardware.tests.memory@1.0-impl", defaults: ["hidl_defaults"], relative_install_path: "hw", @@ -20,12 +20,17 @@ cc_library_shared { "MemoryTest.cpp", ], shared_libs: [ + "libcutils", "libhidlbase", "libhidltransport", "libhidlmemory", + "libhwbinder", "liblog", "libutils", - "android.hardware.tests.memory@1.0", "android.hidl.memory@1.0", ], + + // These are static libs only for testing purposes and portability. Shared + // libs should be used on device. + static_libs: ["android.hardware.tests.memory@1.0"], } \ No newline at end of file diff --git a/tests/multithread/1.0/default/Android.bp b/tests/multithread/1.0/default/Android.bp index a7a750a61f..a94ee3e1b8 100644 --- a/tests/multithread/1.0/default/Android.bp +++ b/tests/multithread/1.0/default/Android.bp @@ -1,4 +1,4 @@ -cc_library_shared { +cc_library { name: "android.hardware.tests.multithread@1.0-impl", defaults: ["hidl_defaults"], relative_install_path: "hw", @@ -7,10 +7,15 @@ cc_library_shared { ], shared_libs: [ "libbase", + "libcutils", "libhidlbase", "libhidltransport", + "libhwbinder", "liblog", "libutils", - "android.hardware.tests.multithread@1.0", ], + + // These are static libs only for testing purposes and portability. Shared + // libs should be used on device. + static_libs: ["android.hardware.tests.multithread@1.0"], } diff --git a/tests/pointer/1.0/default/Android.bp b/tests/pointer/1.0/default/Android.bp index 0c91edb11a..4825ac75a3 100644 --- a/tests/pointer/1.0/default/Android.bp +++ b/tests/pointer/1.0/default/Android.bp @@ -1,6 +1,6 @@ -cc_library_shared { +cc_library { name: "android.hardware.tests.pointer@1.0-impl", defaults: ["hidl_defaults"], relative_install_path: "hw", @@ -11,12 +11,17 @@ cc_library_shared { shared_libs: [ "libbase", + "libcutils", "libhidlbase", "libhidltransport", + "libhwbinder", "libpointertest", "liblog", "libutils", - "android.hardware.tests.pointer@1.0", ], + // These are static libs only for testing purposes and portability. Shared + // libs should be used on device. + static_libs: ["android.hardware.tests.pointer@1.0"], + } diff --git a/tests/pointer/1.0/default/lib/Android.bp b/tests/pointer/1.0/default/lib/Android.bp index ae07b046af..180906b9dd 100644 --- a/tests/pointer/1.0/default/lib/Android.bp +++ b/tests/pointer/1.0/default/lib/Android.bp @@ -1,4 +1,4 @@ -cc_library_shared { +cc_library { name: "libpointertest", defaults: ["hidl_defaults"], srcs: [ @@ -10,8 +10,9 @@ cc_library_shared { "libhidlbase", "libhidltransport", "liblog", - "android.hardware.tests.pointer@1.0", ], + static_libs: ["android.hardware.tests.pointer@1.0"], + local_include_dirs: ["include/hidl-test"], export_include_dirs: ["include"], diff --git a/tests/trie/1.0/default/Android.bp b/tests/trie/1.0/default/Android.bp index 315c8bb826..948a8cbab4 100644 --- a/tests/trie/1.0/default/Android.bp +++ b/tests/trie/1.0/default/Android.bp @@ -1,4 +1,4 @@ -cc_library_shared { +cc_library { name: "android.hardware.tests.trie@1.0-impl", defaults: ["hidl_defaults"], relative_install_path: "hw", @@ -7,10 +7,15 @@ cc_library_shared { ], shared_libs: [ "libbase", + "libcutils", "libhidlbase", "libhidltransport", + "libhwbinder", "liblog", "libutils", - "android.hardware.tests.trie@1.0", ], + + // These are static libs only for testing purposes and portability. Shared + // libs should be used on device. + static_libs: ["android.hardware.tests.trie@1.0"], }