commit 824683aa98598091551c4cbb8caffe97a58156b1
author Robin Peng <robinpeng@google.com> Mon Apr 20 21:36:26 2020 +0800
committer Robin Peng <robinpeng@google.com> Mon Apr 20 21:36:26 2020 +0800
tree b16f425bd109c346a842fc24e110784e6193759b
parent 25118d4ef2e192dfd6b71135d22bb1173864f720

Fix compile error on hwasan build targets

hardware/qcom/sm8150/gps/android/2.0/Android.mk: error: "android.hardware.gnss@2.0-impl-qti (SHARED_LIBRARIES android-arm64) missing liblocbatterylistener.hwasan (STATIC_LIBRARIES android-arm64)"

Bug: 153823050
Change-Id: Iddb2d18b06ff662a88127c2aa6e13617f3258030

android/utils/Android.mk

diff --git a/android/utils/Android.mk b/android/utils/Android.mk
index 9cb6f7b..bd07ada 100644
--- a/android/utils/Android.mk
+++ b/android/utils/Android.mk
@@ -32,6 +32,41 @@
 
 include $(BUILD_STATIC_LIBRARY)
 
+ifeq ($(filter address,$(SANITIZE_TARGET)),)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := liblocbatterylistener.hwasan
+LOCAL_SANITIZE += $(GNSS_SANITIZE)
+# activate the following line for debug purposes only, comment out for production
+#LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG)
+LOCAL_VENDOR_MODULE := true
+
+LOCAL_CFLAGS += $(GNSS_CFLAGS)
+
+LOCAL_C_INCLUDES += \
+    $(LOCAL_PATH) \
+
+LOCAL_SRC_FILES:= \
+    battery_listener.cpp
+LOCAL_SHARED_LIBRARIES := \
+    liblog \
+    libhidlbase \
+    libcutils \
+    libutils \
+    android.hardware.health@1.0 \
+    android.hardware.health@2.0 \
+    android.hardware.power@1.2 \
+    libbase
+
+LOCAL_HEADER_LIBRARIES := \
+    libgps.utils_headers \
+
+LOCAL_STATIC_LIBRARIES := libhealthhalutils
+LOCAL_CFLAGS += -DBATTERY_LISTENER_ENABLED
+
+include $(BUILD_STATIC_LIBRARY)
+endif
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := liblocbatterylistener_headers
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)