commit 2dcbb1efacb66e4ac019458a44640505b7b9b9c4
author ChengYou Ho <chengyouho@google.com> Tue Oct 22 09:08:26 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 22 09:08:26 2019 -0700
tree fdb69be10f885dbc28179682b55e7ea64a247459
parent 24eecb4e8eb4566f09551dcbd6f314bdcb158595
parent d4d1b630d1a60719098a6a798ecf5adb5e6329f9

Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.R1.10.00.00.529.095' into qt-qpr1-dev am: b23301cfa5
am: d4d1b630d1

Change-Id: Ie515da7ba8355e467b0eb6aa14351ac02892403c

android/1.0/Android.mk

diff --git a/android/1.0/Android.mk b/android/1.0/Android.mk
index 9337325..8316732 100644
--- a/android/1.0/Android.mk
+++ b/android/1.0/Android.mk
@@ -34,8 +34,6 @@
 LOCAL_SHARED_LIBRARIES := \
     liblog \
     libhidlbase \
-    libhidltransport \
-    libhwbinder \
     libcutils \
     libutils \
     android.hardware.gnss@1.0 \
@@ -83,9 +81,7 @@
     libqti_vndfwk_detect \
 
 LOCAL_SHARED_LIBRARIES += \
-    libhwbinder \
     libhidlbase \
-    libhidltransport \
     android.hardware.gnss@1.0 \
 
 LOCAL_CFLAGS += $(GNSS_CFLAGS)

android/1.1/Android.mk

diff --git a/android/1.1/Android.mk b/android/1.1/Android.mk
index fb72de1..8865e3e 100644
--- a/android/1.1/Android.mk
+++ b/android/1.1/Android.mk
@@ -34,8 +34,6 @@
 LOCAL_SHARED_LIBRARIES := \
     liblog \
     libhidlbase \
-    libhidltransport \
-    libhwbinder \
     libcutils \
     libutils \
     android.hardware.gnss@1.0 \
@@ -84,9 +82,7 @@
     libqti_vndfwk_detect \
 
 LOCAL_SHARED_LIBRARIES += \
-    libhwbinder \
     libhidlbase \
-    libhidltransport \
     android.hardware.gnss@1.0 \
     android.hardware.gnss@1.1 \
 

android/2.0/Android.mk

diff --git a/android/2.0/Android.mk b/android/2.0/Android.mk
index 7c55504..0cb0ddd 100644
--- a/android/2.0/Android.mk
+++ b/android/2.0/Android.mk
@@ -43,8 +43,6 @@
 LOCAL_SHARED_LIBRARIES := \
     liblog \
     libhidlbase \
-    libhidltransport \
-    libhwbinder \
     libcutils \
     libutils \
     android.hardware.gnss@1.0 \
@@ -94,9 +92,7 @@
     libqti_vndfwk_detect \
 
 LOCAL_SHARED_LIBRARIES += \
-    libhwbinder \
     libhidlbase \
-    libhidltransport \
     android.hardware.gnss@1.0 \
     android.hardware.gnss@1.1 \
     android.hardware.gnss@2.0 \

android/utils/Android.mk

diff --git a/android/utils/Android.mk b/android/utils/Android.mk
index 47b4081..872c772 100644
--- a/android/utils/Android.mk
+++ b/android/utils/Android.mk
@@ -14,8 +14,6 @@
 LOCAL_SHARED_LIBRARIES := \
     liblog \
     libhidlbase \
-    libhidltransport \
-    libhwbinder \
     libcutils \
     libutils \
     android.hardware.health@1.0 \