summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-05-19 06:46:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-05-19 06:46:28 +0000
commit4478e75c5c7175673cfbdd5dbb23dc5f74a82cdc (patch)
treed3ad4cb1ce2d0e50e1527dd9db42fd01235c9e9c
parent4ce2179821eb01f306e82146f416f61355044b24 (diff)
parent631d5b6521aafb4fed6698b27a1606ca13388026 (diff)
Merge "gps: separate the init_gps rc file" into udc-dev
-rw-r--r--gps/brcm/cbd_gps.mk3
-rw-r--r--gps/brcm/conf/Android.bp10
-rw-r--r--gps/brcm/conf/cbd_gps.rc5
-rw-r--r--gps/brcm/prebuilt/init.gps.rc5
4 files changed, 18 insertions, 5 deletions
diff --git a/gps/brcm/cbd_gps.mk b/gps/brcm/cbd_gps.mk
new file mode 100644
index 0000000..74d1a3b
--- /dev/null
+++ b/gps/brcm/cbd_gps.mk
@@ -0,0 +1,3 @@
+# Copy the cbd control gps state init rc file
+PRODUCT_PACKAGES += \
+ cbd_gps.rc
diff --git a/gps/brcm/conf/Android.bp b/gps/brcm/conf/Android.bp
new file mode 100644
index 0000000..97e0af9
--- /dev/null
+++ b/gps/brcm/conf/Android.bp
@@ -0,0 +1,10 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+prebuilt_etc {
+ name: "cbd_gps.rc",
+ src: "cbd_gps.rc",
+ relative_install_path: "init",
+ vendor: true,
+} \ No newline at end of file
diff --git a/gps/brcm/conf/cbd_gps.rc b/gps/brcm/conf/cbd_gps.rc
new file mode 100644
index 0000000..b315fe3
--- /dev/null
+++ b/gps/brcm/conf/cbd_gps.rc
@@ -0,0 +1,5 @@
+# disable gps service if cbd state is invalid
+on property:vendor.ril.cbd.svc=0
+ stop gpsd
+ stop lhd
+ stop scd
diff --git a/gps/brcm/prebuilt/init.gps.rc b/gps/brcm/prebuilt/init.gps.rc
index 5f1bb15..a9823ef 100644
--- a/gps/brcm/prebuilt/init.gps.rc
+++ b/gps/brcm/prebuilt/init.gps.rc
@@ -24,8 +24,3 @@ service gnss_service /vendor/bin/hw/android.hardware.gnss@2.1-service-brcm
ioprio be 0
priority -1
-# disable gps service if no gps h/w
-on property:vendor.ril.cbd.svc=0
- stop gpsd
- stop lhd
- stop scd \ No newline at end of file