diff options
| author | Steven Moreland <smoreland@google.com> | 2019-10-02 16:14:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-10-02 16:14:54 +0000 |
| commit | d84c6b8b35601f7f6b78fba88956092e237928c5 (patch) | |
| tree | c21963b5627701f439ad0f4fa9885556ee8c605e | |
| parent | cec0afb07f79446f863410d6e8df690fab8f5495 (diff) | |
| parent | 2341db65eacb4767e610461e62f46b45fcec99ac (diff) | |
| download | marlin-d84c6b8b35601f7f6b78fba88956092e237928c5.tar.gz | |
Merge "Remove libhwbinder/libhidltransport deps"ndk-sysroot-r21
| -rw-r--r-- | camera/QCamera2/Android.mk | 2 | ||||
| -rw-r--r-- | dumpstate/Android.mk | 2 | ||||
| -rw-r--r-- | health/Android.bp | 2 | ||||
| -rw-r--r-- | power/Android.mk | 1 | ||||
| -rw-r--r-- | usb/Android.bp | 1 | ||||
| -rw-r--r-- | vibrator/Android.bp | 2 |
6 files changed, 1 insertions, 9 deletions
diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk index 368efff8..395a11bd 100644 --- a/camera/QCamera2/Android.mk +++ b/camera/QCamera2/Android.mk @@ -107,7 +107,7 @@ LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface libui libcam LOCAL_SHARED_LIBRARIES += libqdMetaData libqservice libbinder LOCAL_SHARED_LIBRARIES += libcutils libdl LOCAL_HEADER_LIBRARIES := OmxCore_headers gralloc_headers media_plugin_headers -LOCAL_SHARED_LIBRARIES += libhidlbase libhwbinder libutils android.hardware.power@1.1 +LOCAL_SHARED_LIBRARIES += libhidlbase libutils android.hardware.power@1.1 ifeq ($(TARGET_TS_MAKEUP),true) LOCAL_SHARED_LIBRARIES += libts_face_beautify_hal libts_detected_face_hal endif diff --git a/dumpstate/Android.mk b/dumpstate/Android.mk index 596ac908..0e5fdc55 100644 --- a/dumpstate/Android.mk +++ b/dumpstate/Android.mk @@ -30,8 +30,6 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libdumpstateutil \ libhidlbase \ - libhidltransport \ - libhwbinder \ liblog \ libutils diff --git a/health/Android.bp b/health/Android.bp index 2a6c4b5c..af0d0f91 100644 --- a/health/Android.bp +++ b/health/Android.bp @@ -40,8 +40,6 @@ cc_binary { "libbase", "libcutils", "libhidlbase", - "libhidltransport", - "libhwbinder", "libutils", "android.hardware.health@2.0", ], diff --git a/power/Android.mk b/power/Android.mk index 06b2a8e6..f986ff60 100644 --- a/power/Android.mk +++ b/power/Android.mk @@ -45,7 +45,6 @@ LOCAL_SHARED_LIBRARIES := \ libbase \ libcutils \ libhidlbase \ - libhidltransport \ liblog \ libutils \ android.hardware.power@1.1 \ diff --git a/usb/Android.bp b/usb/Android.bp index 2f13b54e..947a8dde 100644 --- a/usb/Android.bp +++ b/usb/Android.bp @@ -21,7 +21,6 @@ cc_binary { shared_libs: [ "libbase", "libhidlbase", - "libhidltransport", "liblog", "libutils", "libhardware", diff --git a/vibrator/Android.bp b/vibrator/Android.bp index 46fc4522..f0ea1534 100644 --- a/vibrator/Android.bp +++ b/vibrator/Android.bp @@ -20,9 +20,7 @@ cc_binary { cflags: ["-Wall", "-Werror"], shared_libs: [ "libhidlbase", - "libhidltransport", "liblog", - "libhwbinder", "libutils", "libhardware", "android.hardware.vibrator@1.0", |