sm8450-common: gps: Convert remaining Android.mk to bp

Change-Id: I75e6af92795fe755a48557aa06106406b14c6750

gps/Android.bp

@@ -31,20 +31,3 @@ qtilocation_cc_defaults {
         },
     },
 }
-
-
-/* Activate the following for debug purposes only,
-   comment out for production */
-GNSS_SANITIZE_DIAG = {
-/*
-    diag: {
-        cfi: true,
-        misc_undefined: [
-            "bounds",
-            "null",
-            "unreachable",
-            "integer",
-        ],
-    },
-*/
-}

gps/Android.mk

@@ -1,40 +0,0 @@
-ifneq ($(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE),)
-
-# Set required flags
-GNSS_CFLAGS := \
-    -Werror \
-    -Wformat \
-    -Wformat-extra-args \
-    -Wunused-label \
-    -Wunused-variable \
-    -Wunused-function \
-    -Wimplicit-fallthrough \
-    -Wno-unused-parameter \
-    -Wno-undefined-bool-conversion
-
-GNSS_HIDL_VERSION := 2.1
-GNSS_AIDL_VERSION := 1
-
-GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST += msm8937
-GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST += msm8953
-GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST += msm8998
-GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST += apq8098_latv
-GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST += sdm710
-GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST += qcs605
-GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST += sdm845
-GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST += sdm660
-
-ifneq (,$(filter $(GNSS_HIDL_LEGACY_MEASURMENTS_TARGET_LIST),$(TARGET_BOARD_PLATFORM)))
-GNSS_HIDL_LEGACY_MEASURMENTS := true
-endif
-
-# Enable NHz location feature. Default is false.
-# Set this flag to true to enable the NHz location feature.
-FEATURE_NHZ_ENABLED := false
-
-LOCAL_PATH := $(call my-dir)
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-GNSS_SANITIZE_DIAG := cfi bounds null unreachable integer address
-
-endif # ifneq ($(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE),)

gps/android/2.1/Android.bp

@@ -0,0 +1,94 @@
+cc_library_shared {
+    name: "android.hardware.gnss@2.1-impl-qti",
+    vintf_fragments: ["android.hardware.gnss@2.1-service-qti.xml"],
+    vendor: true,
+    relative_install_path: "hw",
+    srcs: [
+        "AGnss.cpp",
+        "Gnss.cpp",
+        "AGnssRil.cpp",
+        "GnssMeasurement.cpp",
+        "GnssConfiguration.cpp",
+        "GnssBatching.cpp",
+        "GnssGeofencing.cpp",
+        "GnssNi.cpp",
+        "GnssDebug.cpp",
+        "GnssAntennaInfo.cpp",
+        "MeasurementCorrections.cpp",
+        "GnssVisibilityControl.cpp",
+    ] + [
+        "location_api/GnssAPIClient.cpp",
+        "location_api/MeasurementAPIClient.cpp",
+        "location_api/GeofenceAPIClient.cpp",
+        "location_api/BatchingAPIClient.cpp",
+        "location_api/LocationUtil.cpp",
+    ],
+
+    local_include_dirs: ["location_api"],
+
+    header_libs: [
+        "libgps.utils_headers",
+        "libloc_core_headers",
+        "libloc_pla_headers",
+        "liblocation_api_headers",
+        "liblocbatterylistener_headers",
+    ],
+
+    shared_libs: [
+        "liblog",
+        "libhidlbase",
+        "libcutils",
+        "libutils",
+        "android.hardware.gnss@1.0",
+        "android.hardware.gnss@1.1",
+        "android.hardware.gnss@2.0",
+        "android.hardware.gnss@2.1",
+        "android.hardware.gnss.measurement_corrections@1.0",
+        "android.hardware.gnss.measurement_corrections@1.1",
+        "android.hardware.gnss.visibility_control@1.0",
+        "android.hardware.health@1.0",
+        "android.hardware.health@2.0",
+        "android.hardware.health@2.1",
+        "android.hardware.power@1.2",
+        "libbase",
+    ] + [
+        "libloc_core",
+        "libgps.utils",
+        "libdl",
+        "liblocation_api",
+    ],
+
+    cflags: GNSS_CFLAGS,
+    static_libs: ["liblocbatterylistener"] + ["libhealthhalutils"],
+}
+
+cc_binary {
+    name: "android.hardware.gnss@2.1-service-qti",
+    vendor: true,
+    relative_install_path: "hw",
+    init_rc: ["android.hardware.gnss@2.1-service-qti.rc"],
+    srcs: ["service.cpp"],
+
+    header_libs: [
+        "libgps.utils_headers",
+        "libloc_core_headers",
+        "libloc_pla_headers",
+        "liblocation_api_headers",
+    ],
+
+    shared_libs: [
+        "liblog",
+        "libcutils",
+        "libdl",
+        "libbase",
+        "libutils",
+        "libgps.utils",
+        "libqti_vndfwk_detect_vendor",
+    ] + [
+        "libhidlbase",
+        "android.hardware.gnss@1.0",
+        "android.hardware.gnss@1.1",
+        "android.hardware.gnss@2.0",
+        "android.hardware.gnss@2.1",
+    ],
+}

gps/android/2.1/Android.mk

@@ -1,111 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.gnss@2.1-impl-qti
-# activate the following line for debug purposes only, comment out for production
-#LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG)
-LOCAL_VINTF_FRAGMENTS := android.hardware.gnss@2.1-service-qti.xml
-LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_SRC_FILES := \
-    AGnss.cpp \
-    Gnss.cpp \
-    AGnssRil.cpp \
-    GnssMeasurement.cpp \
-    GnssConfiguration.cpp \
-    GnssBatching.cpp \
-    GnssGeofencing.cpp \
-    GnssNi.cpp \
-    GnssDebug.cpp \
-    GnssAntennaInfo.cpp \
-    MeasurementCorrections.cpp \
-    GnssVisibilityControl.cpp
-
-LOCAL_SRC_FILES += \
-    location_api/GnssAPIClient.cpp \
-    location_api/MeasurementAPIClient.cpp \
-    location_api/GeofenceAPIClient.cpp \
-    location_api/BatchingAPIClient.cpp \
-    location_api/LocationUtil.cpp \
-
-ifeq ($(GNSS_HIDL_LEGACY_MEASURMENTS),true)
-LOCAL_CFLAGS += \
-     -DGNSS_HIDL_LEGACY_MEASURMENTS
-endif
-
-LOCAL_C_INCLUDES:= \
-    $(LOCAL_PATH)/location_api
-
-LOCAL_HEADER_LIBRARIES := \
-    libgps.utils_headers \
-    libloc_core_headers \
-    libloc_pla_headers \
-    liblocation_api_headers \
-    liblocbatterylistener_headers
-
-LOCAL_SHARED_LIBRARIES := \
-    liblog \
-    libhidlbase \
-    libcutils \
-    libutils \
-    android.hardware.gnss@1.0 \
-    android.hardware.gnss@1.1 \
-    android.hardware.gnss@2.0 \
-    android.hardware.gnss@2.1 \
-    android.hardware.gnss.measurement_corrections@1.0 \
-    android.hardware.gnss.measurement_corrections@1.1 \
-    android.hardware.gnss.visibility_control@1.0 \
-    android.hardware.health@1.0 \
-    android.hardware.health@2.0 \
-    android.hardware.health@2.1 \
-    android.hardware.power@1.2 \
-    libbase
-
-LOCAL_SHARED_LIBRARIES += \
-    libloc_core \
-    libgps.utils \
-    libdl \
-    liblocation_api \
-
-LOCAL_CFLAGS += $(GNSS_CFLAGS)
-LOCAL_STATIC_LIBRARIES := liblocbatterylistener
-LOCAL_STATIC_LIBRARIES += libhealthhalutils
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.gnss@2.1-service-qti
-
-# activate the following line for debug purposes only, comment out for production
-#LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG)
-LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_INIT_RC := android.hardware.gnss@2.1-service-qti.rc
-LOCAL_SRC_FILES := \
-    service.cpp \
-
-LOCAL_HEADER_LIBRARIES := \
-    libgps.utils_headers \
-    libloc_core_headers \
-    libloc_pla_headers \
-    liblocation_api_headers
-
-
-LOCAL_SHARED_LIBRARIES := \
-    liblog \
-    libcutils \
-    libdl \
-    libbase \
-    libutils \
-    libgps.utils \
-    libqti_vndfwk_detect_vendor \
-
-LOCAL_SHARED_LIBRARIES += \
-    libhidlbase \
-    android.hardware.gnss@1.0 \
-    android.hardware.gnss@1.1 \
-    android.hardware.gnss@2.0 \
-    android.hardware.gnss@2.1 \
-
-LOCAL_CFLAGS += $(GNSS_CFLAGS)
-
-include $(BUILD_EXECUTABLE)

gps/android/Android.mk

@@ -1,2 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(call all-subdir-makefiles)

gps/android/aidl-impl/Android.bp

@@ -0,0 +1,74 @@
+cc_library_shared {
+    name: "android.hardware.gnss-aidl-impl-qti",
+    vintf_fragments: ["android.hardware.gnss-aidl-service-qti.xml"],
+    vendor: true,
+    relative_install_path: "hw",
+    srcs: [
+        "Gnss.cpp",
+        "GnssConfiguration.cpp",
+        "GnssPowerIndication.cpp",
+        "GnssMeasurementInterface.cpp",
+        "location_api/GnssAPIClient.cpp",
+    ],
+
+    header_libs: [
+        "libgps.utils_headers",
+        "libloc_core_headers",
+        "libloc_pla_headers",
+        "liblocation_api_headers",
+    ],
+
+    shared_libs: [
+        "libbase",
+        "libbinder_ndk",
+        "android.hardware.gnss-V1-ndk",
+        "liblog",
+        "libcutils",
+        "libqti_vndfwk_detect_vendor",
+        "libutils",
+        "libloc_core",
+        "libgps.utils",
+        "libdl",
+        "liblocation_api",
+    ],
+
+    cflags: ["-Wno-format"] + GNSS_CFLAGS,
+}
+
+cc_binary {
+    name: "android.hardware.gnss-aidl-service-qti",
+    vintf_fragments: ["android.hardware.gnss-aidl-service-qti.xml"],
+    vendor: true,
+    relative_install_path: "hw",
+    init_rc: ["android.hardware.gnss-aidl-service-qti.rc"],
+    srcs: ["service.cpp"],
+
+    header_libs: [
+        "libgps.utils_headers",
+        "libloc_core_headers",
+        "libloc_pla_headers",
+        "liblocation_api_headers",
+    ],
+
+    shared_libs: [
+        "liblog",
+        "libcutils",
+        "libdl",
+        "libbase",
+        "libutils",
+        "libgps.utils",
+        "liblocation_api",
+        "libqti_vndfwk_detect_vendor",
+        "libbinder_ndk",
+    ] + [
+        "libhidlbase",
+        "android.hardware.gnss@1.0",
+        "android.hardware.gnss@1.1",
+        "android.hardware.gnss@2.0",
+        "android.hardware.gnss@2.1",
+        "android.hardware.gnss-V1-ndk",
+        "android.hardware.gnss-aidl-impl-qti",
+    ],
+
+    cflags: GNSS_CFLAGS,
+}

gps/android/aidl-impl/Android.mk

@@ -1,92 +0,0 @@
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.gnss-aidl-impl-qti
-# activate the following line for debug purposes only, comment out for production
-#LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG)
-
-LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_VINTF_FRAGMENTS := android.hardware.gnss-aidl-service-qti.xml
-
-LOCAL_SRC_FILES := \
-    Gnss.cpp \
-    GnssConfiguration.cpp \
-    GnssPowerIndication.cpp \
-    GnssMeasurementInterface.cpp \
-    location_api/GnssAPIClient.cpp
-
-LOCAL_HEADER_LIBRARIES := \
-    libgps.utils_headers \
-    libloc_core_headers \
-    libloc_pla_headers \
-    liblocation_api_headers
-
-LOCAL_SHARED_LIBRARIES := \
-    libbase \
-    libbinder_ndk \
-    android.hardware.gnss-V1-ndk \
-    liblog \
-    libcutils \
-    libutils \
-    libloc_core \
-    libgps.utils \
-    libdl \
-    liblocation_api
-
-ifneq ($(TARGET_SUPPORTS_WEARABLES),true)
-    LOCAL_SHARED_LIBRARIES += libqti_vndfwk_detect_vendor
-else
-    LOCAL_SHARED_LIBRARIES += libqti_vndfwk_detect
-endif
-
-LOCAL_CFLAGS += $(GNSS_CFLAGS)
-
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.gnss-aidl-service-qti
-# activate the following line for debug purposes only, comment out for production
-#LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG)
-LOCAL_VINTF_FRAGMENTS := android.hardware.gnss-aidl-service-qti.xml
-LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_INIT_RC := android.hardware.gnss-aidl-service-qti.rc
-LOCAL_SRC_FILES := \
-    service.cpp
-
-LOCAL_HEADER_LIBRARIES := \
-    libgps.utils_headers \
-    libloc_core_headers \
-    libloc_pla_headers \
-    liblocation_api_headers
-
-LOCAL_SHARED_LIBRARIES := \
-    liblog \
-    libcutils \
-    libdl \
-    libbase \
-    libutils \
-    libgps.utils \
-    liblocation_api \
-    libbinder_ndk
-
-ifneq ($(TARGET_SUPPORTS_WEARABLES),true)
-    LOCAL_SHARED_LIBRARIES += libqti_vndfwk_detect_vendor
-else
-    LOCAL_SHARED_LIBRARIES += libqti_vndfwk_detect
-endif
-
-LOCAL_SHARED_LIBRARIES += \
-    libhidlbase \
-    android.hardware.gnss@1.0 \
-    android.hardware.gnss@1.1 \
-    android.hardware.gnss@2.0 \
-    android.hardware.gnss@2.1 \
-    android.hardware.gnss-V1-ndk \
-    android.hardware.gnss-aidl-impl-qti
-
-LOCAL_CFLAGS += $(GNSS_CFLAGS)
-
-include $(BUILD_EXECUTABLE)

gps/android/utils/Android.bp

@@ -30,5 +30,6 @@ cc_library_static {
 cc_library_headers {
 
     name: "liblocbatterylistener_headers",
+    vendor: true,
     export_include_dirs: ["."],
 }