From 120a33fd068cc06c8fef4ea0758068e038af36ac Mon Sep 17 00:00:00 2001 From: basamaryan Date: Wed, 25 Dec 2024 19:39:09 -0500 Subject: [PATCH] sm6150-common: Run bpfix Change-Id: Ife7b541d10e427999657195f266d40b303c09532 Signed-off-by: therealmharc --- gps/android/utils/Android.bp | 2 -- gps/batching/Android.bp | 3 --- gps/core/Android.bp | 3 --- gps/etc/Android.bp | 8 ++++---- gps/geofence/Android.bp | 2 -- gps/gnss/Android.bp | 2 -- gps/location/Android.bp | 3 --- gps/pla/Android.bp | 1 - gps/utils/Android.bp | 3 --- recovery/Android.bp | 1 - rro_overlays/WifiOverlay/Android.bp | 2 +- 11 files changed, 5 insertions(+), 25 deletions(-) diff --git a/gps/android/utils/Android.bp b/gps/android/utils/Android.bp index 20fea88..6a54249 100644 --- a/gps/android/utils/Android.bp +++ b/gps/android/utils/Android.bp @@ -3,8 +3,6 @@ cc_library_static { name: "liblocbatterylistener", vendor: true, - - cflags: GNSS_CFLAGS + ["-DBATTERY_LISTENER_ENABLED"], local_include_dirs: ["."], diff --git a/gps/batching/Android.bp b/gps/batching/Android.bp index ce794d1..710394b 100644 --- a/gps/batching/Android.bp +++ b/gps/batching/Android.bp @@ -1,11 +1,8 @@ - cc_library_shared { name: "libbatching", vendor: true, - - shared_libs: [ "libutils", "libcutils", diff --git a/gps/core/Android.bp b/gps/core/Android.bp index fe9f067..df4efc3 100644 --- a/gps/core/Android.bp +++ b/gps/core/Android.bp @@ -1,11 +1,8 @@ - cc_library_shared { name: "libloc_core", vendor: true, - - shared_libs: [ "liblog", "libutils", diff --git a/gps/etc/Android.bp b/gps/etc/Android.bp index ae500b8..d2eb9bb 100644 --- a/gps/etc/Android.bp +++ b/gps/etc/Android.bp @@ -1,27 +1,27 @@ prebuilt_etc { name: "gnss@2.0-base.policy", vendor: true, - sub_dir: "seccomp_policy", + relative_install_path: "seccomp_policy", src: "seccomp_policy/gnss@2.0-base.policy", } prebuilt_etc { name: "gnss@2.0-xtra-daemon.policy", vendor: true, - sub_dir: "seccomp_policy", + relative_install_path: "seccomp_policy", src: "seccomp_policy/gnss@2.0-xtra-daemon.policy", } prebuilt_etc { name: "gnss@2.0-xtwifi-client.policy", vendor: true, - sub_dir: "seccomp_policy", + relative_install_path: "seccomp_policy", src: "seccomp_policy/gnss@2.0-xtwifi-client.policy", } prebuilt_etc { name: "gnss@2.0-xtwifi-inet-agent.policy", vendor: true, - sub_dir: "seccomp_policy", + relative_install_path: "seccomp_policy", src: "seccomp_policy/gnss@2.0-xtwifi-inet-agent.policy", } diff --git a/gps/geofence/Android.bp b/gps/geofence/Android.bp index bf8474f..ec6f5b6 100644 --- a/gps/geofence/Android.bp +++ b/gps/geofence/Android.bp @@ -5,8 +5,6 @@ cc_library_shared { name: "libgeofencing", vendor: true, - - srcs: [ "GeofenceAdapter.cpp", "location_geofence.cpp", diff --git a/gps/gnss/Android.bp b/gps/gnss/Android.bp index 736ea81..27e34c0 100644 --- a/gps/gnss/Android.bp +++ b/gps/gnss/Android.bp @@ -5,8 +5,6 @@ cc_library_shared { name: "libgnss", vendor: true, - - shared_libs: [ "libutils", "libcutils", diff --git a/gps/location/Android.bp b/gps/location/Android.bp index fb4af2d..82f1d05 100644 --- a/gps/location/Android.bp +++ b/gps/location/Android.bp @@ -1,11 +1,8 @@ - cc_library_shared { name: "liblocation_api", vendor: true, - - shared_libs: [ "libutils", "libcutils", diff --git a/gps/pla/Android.bp b/gps/pla/Android.bp index 5f240eb..a9d05c7 100644 --- a/gps/pla/Android.bp +++ b/gps/pla/Android.bp @@ -1,4 +1,3 @@ - cc_library_headers { name: "libloc_pla_headers", diff --git a/gps/utils/Android.bp b/gps/utils/Android.bp index 33d8440..530485b 100644 --- a/gps/utils/Android.bp +++ b/gps/utils/Android.bp @@ -1,11 +1,8 @@ - cc_library_shared { name: "libgps.utils", vendor: true, - - //# Libs shared_libs: [ "libdl", diff --git a/recovery/Android.bp b/recovery/Android.bp index 3343bcd..e34b26a 100644 --- a/recovery/Android.bp +++ b/recovery/Android.bp @@ -6,4 +6,3 @@ cc_library_static { "libotautil", ], } - diff --git a/rro_overlays/WifiOverlay/Android.bp b/rro_overlays/WifiOverlay/Android.bp index 945f5f1..3e8c511 100644 --- a/rro_overlays/WifiOverlay/Android.bp +++ b/rro_overlays/WifiOverlay/Android.bp @@ -7,5 +7,5 @@ runtime_resource_overlay { name: "WifiOverlay", theme: "WifiOverlay", - product_specific: true + product_specific: true, }