Merge "gps: separate the init_gps rc file" into udc-dev am: 4478e75c5c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/23258460
Change-Id: I0eceb138c9806190be34eb73c01a0d3a360cb3db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 @@
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