summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--android/1.0/Android.mk4
-rw-r--r--android/1.1/Android.mk4
-rw-r--r--android/2.0/Android.mk4
-rw-r--r--android/2.0/android.hardware.gnss@2.0-service-qti.rc2
-rw-r--r--android/utils/Android.mk2
-rw-r--r--batching/Makefile.am2
-rw-r--r--etc/Android.mk4
-rw-r--r--gnss/GnssAdapter.cpp3
-rw-r--r--gnss/Makefile.am2
-rw-r--r--os_pickup.bp17
-rw-r--r--os_pickup.mk6
11 files changed, 31 insertions, 19 deletions
diff --git a/android/1.0/Android.mk b/android/1.0/Android.mk
index 112ae8b..797ecce 100644
--- a/android/1.0/Android.mk
+++ b/android/1.0/Android.mk
@@ -37,8 +37,6 @@ LOCAL_HEADER_LIBRARIES := \
LOCAL_SHARED_LIBRARIES := \
liblog \
libhidlbase \
- libhidltransport \
- libhwbinder \
libcutils \
libutils \
android.hardware.gnss@1.0 \
@@ -89,9 +87,7 @@ LOCAL_SHARED_LIBRARIES := \
libqti_vndfwk_detect \
LOCAL_SHARED_LIBRARIES += \
- libhwbinder \
libhidlbase \
- libhidltransport \
android.hardware.gnss@1.0 \
LOCAL_CFLAGS += $(GNSS_CFLAGS)
diff --git a/android/1.1/Android.mk b/android/1.1/Android.mk
index 132c1e1..66abd06 100644
--- a/android/1.1/Android.mk
+++ b/android/1.1/Android.mk
@@ -37,8 +37,6 @@ LOCAL_HEADER_LIBRARIES := \
LOCAL_SHARED_LIBRARIES := \
liblog \
libhidlbase \
- libhidltransport \
- libhwbinder \
libcutils \
libutils \
android.hardware.gnss@1.0 \
@@ -90,9 +88,7 @@ LOCAL_SHARED_LIBRARIES := \
libqti_vndfwk_detect \
LOCAL_SHARED_LIBRARIES += \
- libhwbinder \
libhidlbase \
- libhidltransport \
android.hardware.gnss@1.0 \
android.hardware.gnss@1.1 \
diff --git a/android/2.0/Android.mk b/android/2.0/Android.mk
index d9ac77c..b6790c5 100644
--- a/android/2.0/Android.mk
+++ b/android/2.0/Android.mk
@@ -46,8 +46,6 @@ LOCAL_HEADER_LIBRARIES := \
LOCAL_SHARED_LIBRARIES := \
liblog \
libhidlbase \
- libhidltransport \
- libhwbinder \
libcutils \
libutils \
android.hardware.gnss@1.0 \
@@ -100,9 +98,7 @@ LOCAL_SHARED_LIBRARIES := \
libqti_vndfwk_detect \
LOCAL_SHARED_LIBRARIES += \
- libhwbinder \
libhidlbase \
- libhidltransport \
android.hardware.gnss@1.0 \
android.hardware.gnss@1.1 \
android.hardware.gnss@2.0 \
diff --git a/android/2.0/android.hardware.gnss@2.0-service-qti.rc b/android/2.0/android.hardware.gnss@2.0-service-qti.rc
index ad46d5d..36ee47c 100644
--- a/android/2.0/android.hardware.gnss@2.0-service-qti.rc
+++ b/android/2.0/android.hardware.gnss@2.0-service-qti.rc
@@ -1,4 +1,4 @@
service gnss_service /vendor/bin/hw/android.hardware.gnss@2.0-service-qti
class hal
user gps
- group system gps radio vendor_qti_diag
+ group system gps radio
diff --git a/android/utils/Android.mk b/android/utils/Android.mk
index 0e4c953..9cb6f7b 100644
--- a/android/utils/Android.mk
+++ b/android/utils/Android.mk
@@ -17,8 +17,6 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
liblog \
libhidlbase \
- libhidltransport \
- libhwbinder \
libcutils \
libutils \
android.hardware.health@1.0 \
diff --git a/batching/Makefile.am b/batching/Makefile.am
index ef8011e..d61f64f 100644
--- a/batching/Makefile.am
+++ b/batching/Makefile.am
@@ -40,6 +40,6 @@ lib_LTLIBRARIES = libbatching.la
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = location-batching.pc
-sysconf_DATA = $(WORKSPACE)/hardware/qcom/gps/etc/flp.conf
+sysconf_DATA = $(WORKSPACE)/hardware/qcom/sm7150/gps/etc/flp.conf
EXTRA_DIST = $(pkgconfig_DATA)
diff --git a/etc/Android.mk b/etc/Android.mk
index 22ca2f7..6746876 100644
--- a/etc/Android.mk
+++ b/etc/Android.mk
@@ -1,4 +1,4 @@
-
+ifneq ($(BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET),true)
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
@@ -18,4 +18,4 @@ LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := flp.conf
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)
include $(BUILD_PREBUILT)
-
+endif
diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp
index 5ce7b18..4dbd182 100644
--- a/gnss/GnssAdapter.cpp
+++ b/gnss/GnssAdapter.cpp
@@ -797,6 +797,8 @@ GnssAdapter::setConfig()
gnssConfigRequested.aGlonassPositionProtocolMask =
gpsConf.A_GLONASS_POS_PROTOCOL_SELECT;
}
+
+ /* Let HAL do nothing to LPPe, just set it by MBN
if (gpsConf.LPPE_CP_TECHNOLOGY) {
gnssConfigRequested.flags |= GNSS_CONFIG_FLAGS_LPPE_CONTROL_PLANE_VALID_BIT;
gnssConfigRequested.lppeControlPlaneMask =
@@ -808,6 +810,7 @@ GnssAdapter::setConfig()
gnssConfigRequested.lppeUserPlaneMask =
mLocApi->convertLppeUp(gpsConf.LPPE_UP_TECHNOLOGY);
}
+ */
gnssConfigRequested.blacklistedSvIds.assign(mBlacklistedSvIds.begin(),
mBlacklistedSvIds.end());
mLocApi->sendMsg(new LocApiMsg(
diff --git a/gnss/Makefile.am b/gnss/Makefile.am
index db20c15..92724ed 100644
--- a/gnss/Makefile.am
+++ b/gnss/Makefile.am
@@ -5,7 +5,7 @@ AM_CFLAGS = \
$(LOCCORE_CFLAGS) \
-I./ \
-I../utils \
- -I$(WORKSPACE)/hardware/qcom/gps/core/data-items \
+ -I$(WORKSPACE)/hardware/qcom/sm7150/gps/core/data-items \
-I../location \
-std=c++1y
diff --git a/os_pickup.bp b/os_pickup.bp
new file mode 100644
index 0000000..538c529
--- /dev/null
+++ b/os_pickup.bp
@@ -0,0 +1,17 @@
+//hardware/qcom/sm7150/Android.bp links to this file
+bootstrap_go_package {
+ name: "soong-display_defaults_sm7150",
+ pkgPath: "android/soong/hardware/qcom/sm7150/display",
+ deps: [
+ "blueprint",
+ "blueprint-pathtools",
+ "soong",
+ "soong-android",
+ "soong-cc",
+ "soong-genrule",
+ ],
+ srcs: [
+ "display/display_defaults.go",
+ ],
+ pluginFor: ["soong_build"],
+}
diff --git a/os_pickup.mk b/os_pickup.mk
new file mode 100644
index 0000000..cc2059d
--- /dev/null
+++ b/os_pickup.mk
@@ -0,0 +1,6 @@
+ifeq ($(PRODUCT_PLATFORM),sm7150)
+ifneq ($(BUILD_WITHOUT_VENDOR), true)
+LOCAL_PATH := $(call my-dir)
+include $(call first-makefiles-under,$(LOCAL_PATH))
+endif
+endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 21:59:00 +0000