commit 91b97a62c55934636ef918e672b66a735b1c5050
author android-build-team Robot <android-build-team-robot@google.com> Tue Apr 28 20:25:10 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Apr 28 20:25:10 2020 +0000
tree 6b64d36a7bc3a9c90af2f9ddca18ac656acc9b73
parent a1f05998bf63f2d54021105c0a3fc90eb5c2ffa2
parent 4afa3bd3caeb85029f575ddd52cc337a5cfc5916

Snap for 6439596 from 4afa3bd3caeb85029f575ddd52cc337a5cfc5916 to qt-aml-tzdata-release

Change-Id: Iaaccdff840c11ebfdbb313cf8ec3f1125d765a81

benchmarks/Android.mk

diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
index d82c0a3..6b94f04 100644
--- a/benchmarks/Android.mk
+++ b/benchmarks/Android.mk
@@ -23,10 +23,12 @@
 LOCAL_CFLAGS := -Wall -Werror
 
 LOCAL_SHARED_LIBRARIES := \
+    libhwbinder \
     libbase \
     libcutils \
     libutils \
-    libhidlbase
+    libhidlbase \
+    libhidltransport
 
 LOCAL_REQUIRED_MODULES := android.hardware.tests.msgq@1.0-impl
 

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index b85aa16..ab2b2ce 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -28,6 +28,8 @@
         "libcutils",
         "libfmq",
         "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
         "liblog",
         "libutils",
     ],
@@ -50,6 +52,8 @@
         "libcutils",
         "libfmq",
         "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
         "liblog",
         "libutils",
     ],

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 6efe7c2..c6b6026 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -24,8 +24,6 @@
     android.hardware.tests.msgq@1.0-service-test    \
     hidl_test_helper
 
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativetest64
-
 ifneq ($(TARGET_2ND_ARCH),)
 LOCAL_REQUIRED_MODULES += android.hardware.tests.msgq@1.0-service-test$(TARGET_2ND_ARCH_MODULE_SUFFIX)
 LOCAL_REQUIRED_MODULES += mq_test_client$(TARGET_2ND_ARCH_MODULE_SUFFIX)