summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2019-06-10 13:44:19 -0700
committerSteven Moreland <smoreland@google.com>2019-06-12 13:49:19 -0700
commit085a82ecb152ad8bcac8eff0bb9cb3e94519edf2 (patch)
tree9cb1b8c9f3f9ab05fbc705dc373d127ec428fa60
parent22f6dcec7e81c1a747b516377d2e7fc8cb06c508 (diff)
downloadandroid_hardware_interfaces-085a82ecb152ad8bcac8eff0bb9cb3e94519edf2.tar.gz
android_hardware_interfaces-085a82ecb152ad8bcac8eff0bb9cb3e94519edf2.tar.bz2
android_hardware_interfaces-085a82ecb152ad8bcac8eff0bb9cb3e94519edf2.zip
libhidltransport users user libhidlbase
libhidltransport symbols are being moved into libhidlbase in order to optimize linking/memory usage. libhidltransport will no longer be required in the future (however removing references to it will come separately). Bug: 134961554 Test: boot Change-Id: Ibcc2db32d3bec1a786b60e11d4820ecd0605f403
-rw-r--r--graphics/composer/2.2/vts/functional/Android.bp1
-rw-r--r--graphics/composer/2.3/vts/functional/Android.bp1
-rw-r--r--health/storage/1.0/vts/functional/Android.bp3
-rw-r--r--wifi/1.3/default/Android.mk2
4 files changed, 5 insertions, 2 deletions
diff --git a/graphics/composer/2.2/vts/functional/Android.bp b/graphics/composer/2.2/vts/functional/Android.bp
index b62f3021b..4cb0bdf07 100644
--- a/graphics/composer/2.2/vts/functional/Android.bp
+++ b/graphics/composer/2.2/vts/functional/Android.bp
@@ -25,6 +25,7 @@ cc_test {
// TODO(b/64437680): Assume these libs are always available on the device.
shared_libs: [
"libfmq",
+ "libhidlbase",
"libhidltransport",
"libsync",
],
diff --git a/graphics/composer/2.3/vts/functional/Android.bp b/graphics/composer/2.3/vts/functional/Android.bp
index 7548cb521..ce675ee4e 100644
--- a/graphics/composer/2.3/vts/functional/Android.bp
+++ b/graphics/composer/2.3/vts/functional/Android.bp
@@ -22,6 +22,7 @@ cc_test {
// TODO(b/64437680): Assume these libs are always available on the device.
shared_libs: [
"libfmq",
+ "libhidlbase",
"libhidltransport",
"libsync",
],
diff --git a/health/storage/1.0/vts/functional/Android.bp b/health/storage/1.0/vts/functional/Android.bp
index 250a7dcb8..b18e36f83 100644
--- a/health/storage/1.0/vts/functional/Android.bp
+++ b/health/storage/1.0/vts/functional/Android.bp
@@ -20,7 +20,8 @@ cc_test {
srcs: ["VtsHalHealthStorageV1_0TargetTest.cpp"],
static_libs: ["android.hardware.health.storage@1.0"],
shared_libs: [
- "libhidltransport"
+ "libhidlbase",
+ "libhidltransport",
],
test_suites: ["general-tests"],
}
diff --git a/wifi/1.3/default/Android.mk b/wifi/1.3/default/Android.mk
index 1f918618f..0a3809cce 100644
--- a/wifi/1.3/default/Android.mk
+++ b/wifi/1.3/default/Android.mk
@@ -155,11 +155,11 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libgmock \
libgtest \
- libhidlbase \
android.hardware.wifi@1.0-service-lib
LOCAL_SHARED_LIBRARIES := \
libbase \
libcutils \
+ libhidlbase \
libhidltransport \
liblog \
libnl \