diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-13 22:02:31 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-13 22:02:31 +0000 |
commit | 240f9e1476b6a3e1f56dab10cb307316bdeb42bc (patch) | |
tree | 7ecb5ffc88e4d4c0f5d7543727dbbad995fe3f60 /tests | |
parent | 458b8fa5bd5ade075b2868ddcc220b0ebc7e72e9 (diff) | |
parent | 26d0dcf32ebbfcfa12f5f63a7241929a6bc1e7bb (diff) | |
download | android_hardware_interfaces-240f9e1476b6a3e1f56dab10cb307316bdeb42bc.tar.gz android_hardware_interfaces-240f9e1476b6a3e1f56dab10cb307316bdeb42bc.tar.bz2 android_hardware_interfaces-240f9e1476b6a3e1f56dab10cb307316bdeb42bc.zip |
Merge changes from topic "hidl-test"
* changes:
Statically link msgq test impl.
Static link test lib shims with test -impl libs.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/bar/1.0/default/Android.bp | 9 | ||||
-rw-r--r-- | tests/baz/1.0/default/Android.bp | 10 | ||||
-rw-r--r-- | tests/foo/1.0/default/Android.bp | 10 | ||||
-rw-r--r-- | tests/foo/1.0/default/lib/Android.bp | 8 | ||||
-rw-r--r-- | tests/hash/1.0/default/Android.bp | 10 | ||||
-rw-r--r-- | tests/inheritance/1.0/default/Android.bp | 9 | ||||
-rw-r--r-- | tests/memory/1.0/default/Android.bp | 9 | ||||
-rw-r--r-- | tests/msgq/1.0/default/Android.bp | 21 | ||||
-rw-r--r-- | tests/multithread/1.0/default/Android.bp | 9 | ||||
-rw-r--r-- | tests/pointer/1.0/default/Android.bp | 9 | ||||
-rw-r--r-- | tests/pointer/1.0/default/lib/Android.bp | 5 | ||||
-rw-r--r-- | tests/trie/1.0/default/Android.bp | 9 |
12 files changed, 92 insertions, 26 deletions
diff --git a/tests/bar/1.0/default/Android.bp b/tests/bar/1.0/default/Android.bp index 82d34a95c..8aa6135fa 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 f247b8378..492e0b4ae 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 0e1d34d35..d9dfc6926 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 895582c58..2cc96c551 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 67f90977d..6e6d6a8e3 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 158da4b12..891355b33 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 efd416508..985183bc0 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/msgq/1.0/default/Android.bp b/tests/msgq/1.0/default/Android.bp index be4fe9454..6bbca2459 100644 --- a/tests/msgq/1.0/default/Android.bp +++ b/tests/msgq/1.0/default/Android.bp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -cc_library_shared { +cc_library { name: "android.hardware.tests.msgq@1.0-impl", defaults: ["hidl_defaults"], relative_install_path: "hw", @@ -27,10 +27,16 @@ cc_library_shared { "libfmq", "libhidlbase", "libhidltransport", + "libhwbinder", "liblog", "libutils", - "android.hardware.tests.msgq@1.0", ], + + // These are static libs only for testing purposes and portability. Shared + // libs should be used on device. + static_libs: [ + "android.hardware.tests.msgq@1.0", + ] } cc_test { @@ -59,10 +65,19 @@ cc_test { shared_libs: [ "libbase", "libcutils", + "libfmq", "libhidlbase", "libhidltransport", + "libhwbinder", "liblog", "libutils", - "android.hardware.tests.msgq@1.0" ], + + // Allow dlsym'ing self for statically linked passthrough implementations + ldflags: ["-rdynamic"], + + // These are static libs only for testing purposes and portability. Shared + // libs should be used on device. + static_libs: ["android.hardware.tests.msgq@1.0"], + whole_static_libs: ["android.hardware.tests.msgq@1.0-impl"], } diff --git a/tests/multithread/1.0/default/Android.bp b/tests/multithread/1.0/default/Android.bp index a7a750a61..a94ee3e1b 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 0c91edb11..4825ac75a 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 ae07b046a..180906b9d 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 315c8bb82..948a8cbab 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"], } |