From 18c99090be9e90ca419d17410de01bca1bdd90b0 Mon Sep 17 00:00:00 2001 From: haohuang Date: Sat, 15 Dec 2018 17:01:37 +0800 Subject: [PATCH] Qualcomm Unified Vendor - GPS Remove remaining build flag checks in all location vendor modules : BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET LW_FEATURE_SET Change-Id: Ideacd3ae7f6a49ff3da3ca8cd14668c01400484a CRs-Fixed: 2341041 --- android/1.0/Android.mk | 9 --------- android/1.1/Android.mk | 9 --------- core/Android.mk | 6 ------ 3 files changed, 24 deletions(-) diff --git a/android/1.0/Android.mk b/android/1.0/Android.mk index dc721db4..1893560d 100644 --- a/android/1.0/Android.mk +++ b/android/1.0/Android.mk @@ -48,14 +48,6 @@ LOCAL_SHARED_LIBRARIES += \ LOCAL_CFLAGS += $(GNSS_CFLAGS) include $(BUILD_SHARED_LIBRARY) -BUILD_GNSS_HIDL_SERVICE := true -ifneq ($(BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET), true) -ifneq ($(LW_FEATURE_SET),true) -BUILD_GNSS_HIDL_SERVICE := false -endif # LW_FEATURE_SET -endif # BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET - -ifeq ($(BUILD_GNSS_HIDL_SERVICE), true) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@1.0-service-qti LOCAL_VENDOR_MODULE := true @@ -88,4 +80,3 @@ LOCAL_SHARED_LIBRARIES += \ LOCAL_CFLAGS += $(GNSS_CFLAGS) include $(BUILD_EXECUTABLE) -endif # BUILD_GNSS_HIDL_SERVICE diff --git a/android/1.1/Android.mk b/android/1.1/Android.mk index 4f1cdf25..3c3d734a 100644 --- a/android/1.1/Android.mk +++ b/android/1.1/Android.mk @@ -49,14 +49,6 @@ LOCAL_SHARED_LIBRARIES += \ LOCAL_CFLAGS += $(GNSS_CFLAGS) include $(BUILD_SHARED_LIBRARY) -BUILD_GNSS_HIDL_SERVICE := true -ifneq ($(BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET), true) -ifneq ($(LW_FEATURE_SET),true) -BUILD_GNSS_HIDL_SERVICE := false -endif # LW_FEATURE_SET -endif # BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET - -ifeq ($(BUILD_GNSS_HIDL_SERVICE), true) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@1.1-service-qti LOCAL_VENDOR_MODULE := true @@ -90,4 +82,3 @@ LOCAL_SHARED_LIBRARIES += \ LOCAL_CFLAGS += $(GNSS_CFLAGS) include $(BUILD_EXECUTABLE) -endif # BUILD_GNSS_HIDL_SERVICE diff --git a/core/Android.mk b/core/Android.mk index 1a4f51ab..97614a17 100644 --- a/core/Android.mk +++ b/core/Android.mk @@ -9,12 +9,6 @@ LOCAL_MODULE := libloc_core LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional -ifeq ($(TARGET_DEVICE),apq8026_lw) -LOCAL_CFLAGS += -DPDK_FEATURE_SET -else ifeq ($(BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET),true) -LOCAL_CFLAGS += -DPDK_FEATURE_SET -endif - LOCAL_SHARED_LIBRARIES := \ liblog \ libutils \