From db88893be418dc0443238ac3d692adfd2872874e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Darrel=20Gri=C3=ABt?= <dgriet@gmail.com>
Date: Sun, 18 Sep 2022 22:47:20 +0200
Subject: [PATCH] catfish: android-init: Remove duplicate services, set
Bluetooth MAC address and fix GPS.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The hybris files now provide a base set of services removing the need for explicit definition here.
Additionally, the Bluetooth service now requires a valid MAC address (previously it used the chips' default).
Start the two GPS services when the Broadcom GPS chip is used.
Signed-off-by: Darrel Griët <dgriet@gmail.com>
---
.../android-init/android-init/default.prop | 1 +
.../android-init/android-init/init.rc | 37 +++++++++----------
.../android-init/android-init_1.0.bbappend | 6 ++-
3 files changed, 23 insertions(+), 21 deletions(-)
create mode 100644 meta-catfish/recipes-android/android-init/android-init/default.prop
diff --git a/meta-catfish/recipes-android/android-init/android-init/default.prop b/meta-catfish/recipes-android/android-init/android-init/default.prop
new file mode 100644
index 00000000..798ff677
--- /dev/null
+++ b/meta-catfish/recipes-android/android-init/android-init/default.prop
@@ -0,0 +1 @@
+ro.bt.bdaddr_path=/persist/bt_nv.bin
diff --git a/meta-catfish/recipes-android/android-init/android-init/init.rc b/meta-catfish/recipes-android/android-init/android-init/init.rc
index f6b495eb..ba0327c8 100644
--- a/meta-catfish/recipes-android/android-init/android-init/init.rc
+++ b/meta-catfish/recipes-android/android-init/android-init/init.rc
@@ -10,10 +10,18 @@ on init
chown system root /sys/class/timed_output/vibrator/enable
+ chown system root /dev/hwbinder
+ chown system root /dev/vndbinder
+
+ chmod 777 /dev/hwbinder
+ chmod 777 /dev/vndbinder
+
load_system_props
restorecon_recursive /persist
mkdir /data/
+ mkdir /data/system/
+ mkdir /data/system/gps/
mkdir /data/vendor
mkdir /data/vendor/sensor
mkdir /data/vendor/sensor/nanohub_lock
@@ -27,31 +35,22 @@ on init
chown 1000 root /dev/nanohub_comms
chown 1000 root /dev/nanohub_custom_flash
- setprop init.svc.bluetooth running
-
class_start core
-
-service logd /usr/libexec/hal-droid/system/bin/logd
- class core
- socket logd stream 0666 logd logd
- socket logdr seqpacket 0666 logd logd
- socket logdw dgram 0222 logd logd
- file /proc/kmsg r
- file /dev/kmsg w
- user logd
- group logd system readproc
+ class_start hal
service rmt_storage /vendor/bin/rmt_storage
class core
-service servicemanager /usr/libexec/hal-droid/system/bin/servicemanager
- setenv LD_PRELOAD /usr/libexec/hal-droid/system/lib/libselinux_stubs.so
- class core
+on property:ro.gps_hardware.name=brcm
+ start lhd
+ start gpsd
-service hwservicemanager /system/bin/hwservicemanager
- setenv LD_PRELOAD /usr/libexec/hal-droid/system/lib/libselinux_stubs.so
+# SensorHub (Location Hub) different lhd.conf
+service lhd /vendor/bin/lhd /vendor/etc/lhd.conf
class core
+ disabled
-service bt /vendor/bin/hw/android.hardware.bluetooth@1.0-service
+# GPS use special version of gps.xml for 4774 to work with LHD
+service gpsd /vendor/bin/gpsd -c /vendor/etc/gps.xml
class core
- oneshot
+ disabled
diff --git a/meta-catfish/recipes-android/android-init/android-init_1.0.bbappend b/meta-catfish/recipes-android/android-init/android-init_1.0.bbappend
index 655128d9..12dd5be6 100644
--- a/meta-catfish/recipes-android/android-init/android-init_1.0.bbappend
+++ b/meta-catfish/recipes-android/android-init/android-init_1.0.bbappend
@@ -1,11 +1,13 @@
FILESEXTRAPATHS:prepend:catfish := "${THISDIR}/${PN}:"
SRC_URI:append:catfish = " file://nonplat_property_contexts \
- file://plat_property_contexts"
+ file://plat_property_contexts \
+ file://default.prop"
do_install:append:catfish() {
install -m 0644 ${WORKDIR}/nonplat* ${D}/
install -m 0644 ${WORKDIR}/plat* ${D}/
+ install -m 0644 ${WORKDIR}/default.prop ${D}/
}
-FILES:${PN} += "/nonplat* /plat*"
\ No newline at end of file
+FILES:${PN} += "/nonplat* /plat* /default.prop"
\ No newline at end of file