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
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)
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 \
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 \
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 \