Skip to content

Commit

Permalink
sm7250-common: gps/location: Convert remaining Android.mk to bp
Browse files Browse the repository at this point in the history
Change-Id: I75e6af92795fe755a48557aa06106406b14c6750
  • Loading branch information
mikeNG authored and Vivekachooz committed Feb 3, 2025
1 parent a53e958 commit 4f17b76
Show file tree
Hide file tree
Showing 18 changed files with 129 additions and 281 deletions.
1 change: 0 additions & 1 deletion BoardConfigCommon.mk
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ TARGET_FS_CONFIG_GEN := \

# GPS
BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := default
LOC_HIDL_VERSION := 4.0

# HIDL
DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
Expand Down
28 changes: 0 additions & 28 deletions gps/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,3 @@ GNSS_CFLAGS = [
"-Wno-error=date-time",
"-Wno-deprecated-volatile",
]

/* Activate the following for regression testing */
GNSS_SANITIZE = {
/* address: true,*/
cfi: true,
misc_undefined: [
"bounds",
"null",
"unreachable",
"integer",
],
}

/* Activate the following for debug purposes only,
comment out for production */
GNSS_SANITIZE_DIAG = {
/*
diag: {
cfi: true,
misc_undefined: [
"bounds",
"null",
"unreachable",
"integer",
],
},
*/
}
45 changes: 0 additions & 45 deletions gps/Android.mk

This file was deleted.

96 changes: 96 additions & 0 deletions gps/android/2.1/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
cc_library_shared {
name: "[email protected]",
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",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"libbase",
] + [
"libloc_core",
"libgps.utils",
"libdl",
"liblocation_api",
],

cflags: GNSS_CFLAGS,
static_libs: ["liblocbatterylistener"] + ["libhealthhalutils"],
}

cc_binary {
name: "[email protected]",
vintf_fragments: ["[email protected]"],
vendor: true,
relative_install_path: "hw",
init_rc: ["[email protected]"],
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",
] + [
"libhidlbase",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
],

cflags: GNSS_CFLAGS + ["-DLOC_HIDL_VERSION=\"4.0\""],
}
116 changes: 0 additions & 116 deletions gps/android/2.1/Android.mk

This file was deleted.

2 changes: 0 additions & 2 deletions gps/android/Android.mk

This file was deleted.

3 changes: 2 additions & 1 deletion gps/android/utils/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cc_library_static {
name: "liblocbatterylistener",
vendor: true,

sanitize: GNSS_SANITIZE,


cflags: GNSS_CFLAGS + ["-DBATTERY_LISTENER_ENABLED"],
local_include_dirs: ["."],
Expand Down Expand Up @@ -33,5 +33,6 @@ cc_library_static {
cc_library_headers {

name: "liblocbatterylistener_headers",
vendor: true,
export_include_dirs: ["."],
}
2 changes: 1 addition & 1 deletion gps/batching/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cc_library_shared {
name: "libbatching",
vendor: true,

sanitize: GNSS_SANITIZE,


shared_libs: [
"libutils",
Expand Down
2 changes: 1 addition & 1 deletion gps/core/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cc_library_shared {
name: "libloc_core",
vendor: true,

sanitize: GNSS_SANITIZE,


shared_libs: [
"liblog",
Expand Down
2 changes: 1 addition & 1 deletion gps/geofence/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cc_library_shared {
name: "libgeofencing",
vendor: true,

sanitize: GNSS_SANITIZE,


srcs: [
"GeofenceAdapter.cpp",
Expand Down
2 changes: 1 addition & 1 deletion gps/gnss/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cc_library_shared {
name: "libgnss",
vendor: true,

sanitize: GNSS_SANITIZE,


shared_libs: [
"libutils",
Expand Down
2 changes: 1 addition & 1 deletion gps/location/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cc_library_shared {
name: "liblocation_api",
vendor: true,

sanitize: GNSS_SANITIZE,


shared_libs: [
"libutils",
Expand Down
2 changes: 1 addition & 1 deletion gps/utils/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cc_library_shared {
name: "libgps.utils",
vendor: true,

sanitize: GNSS_SANITIZE,


//# Libs
shared_libs: [
Expand Down
Loading

0 comments on commit 4f17b76

Please sign in to comment.