commit 1b34d67b7a3572b884398fafebacc23baac8853d
author Devin Moore <devinmoore@google.com> Wed Jul 08 09:31:08 2020 -0700
committer Devin Moore <devinmoore@google.com> Fri Aug 14 09:21:22 2020 -0700
tree 4c807dcf7ceeb2e7d3d80a0b1d3bf80d5e90599c
parent fcd14d18244248c89f98113a875bcdb56d572de7

Adding AidlMQDescriptor and GrantorDescriptor

Adding these two types to android.hardware.common for future use with
Fast Message Queue in libfmq.

Also adding to the mq_test_service to test them.

Test: system/tools/hidl/tests/run_all_device_tests.sh

Bug: 142326204

Change-Id: I424c4849c822436f58e40f206b09ffdf9baf260b

tests/msgq/1.0/default/Android.bp

diff --git a/tests/msgq/1.0/default/Android.bp b/tests/msgq/1.0/default/Android.bp
index e6408aa..47b8df1 100644
--- a/tests/msgq/1.0/default/Android.bp
+++ b/tests/msgq/1.0/default/Android.bp
@@ -19,7 +19,7 @@
     relative_install_path: "hw",
     srcs: [
         "TestMsgQ.cpp",
-        "BenchmarkMsgQ.cpp"
+        "BenchmarkMsgQ.cpp",
     ],
     shared_libs: [
         "libbase",
@@ -34,7 +34,7 @@
     // libs should be used on device.
     static_libs: [
         "android.hardware.tests.msgq@1.0",
-    ]
+    ],
 }
 
 cc_test {
@@ -49,7 +49,7 @@
         "libhidlbase",
         "liblog",
         "libutils",
-        "android.hardware.tests.msgq@1.0"
+        "android.hardware.tests.msgq@1.0",
     ],
     test_suites: ["general-tests"],
 }
@@ -67,6 +67,7 @@
         "libhidlbase",
         "liblog",
         "libutils",
+        "libbinder_ndk",
     ],
 
     // Allow dlsym'ing self for statically linked passthrough implementations
@@ -74,7 +75,14 @@
 
     // 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"],
+    static_libs: [
+        "android.hardware.tests.msgq@1.0",
+        "android.fmq.test-ndk_platform",
+        "android.hardware.common-unstable-ndk_platform",
+    ],
+    whole_static_libs: [
+        "android.hardware.tests.msgq@1.0-impl",
+        "android.fmq.test-impl",
+    ],
     test_suites: ["general-tests"],
 }