raviole: centralize common part of init.<DEVICE>.rc into init.raviole.rc
Bug: 167996145
Change-Id: I1e12d64295ffd4f990ad97455dc8a1ab965b6133
diff --git a/conf/init.oriole.rc b/conf/init.oriole.rc
index 4ad4a21..77f03f5 100644
--- a/conf/init.oriole.rc
+++ b/conf/init.oriole.rc
@@ -1,8 +1,6 @@
# Oriole specific init.rc
import /vendor/etc/init/hw/init.gs101.rc
-
-on init && property:ro.build.flavor=factory_oriole-userdebug
- import /vendor/etc/init/hw/init.factory.rc
+import /vendor/etc/init/hw/init.raviole.rc
on init
# logbuffer
@@ -11,33 +9,6 @@
chown system system /d/regmap/5-0036/registers
chown system system /sys/bus/nvmem/devices/4-00500/nvmem
-on early-boot
- # Wait for insmod_sh to finish all common modules
- wait_for_prop vendor.common.modules.ready 1
- start insmod_sh_oriole
-
-service insmod_sh_oriole /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.oriole.cfg
- class main
- user root
- group root system
- disabled
- oneshot
-
-on fs
- # Fingerprint
- chown system system /dev/goodix_fp
- exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g6.app
-
- # Start the twoshay touch service
- start twoshay
-
- # LHBM
- # FIXME(b/183223359): Only grant write access to SystemUI.
- chmod 0666 /sys/class/drm/card0/card0-DSI-1/panel/backlight/panel0-backlight/local_hbm_mode
-
-on property:ro.revision=PROTO1.0
- setprop persist.fingerprint.ghbm true
-
# Toggle glove_mode according to touch_sensitivity_mode
on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_completed=1
write /sys/class/spi_master/spi11/spi11.0/glove_mode 00
diff --git a/conf/init.raven.rc b/conf/init.raven.rc
index b468737..2b2e0b7 100644
--- a/conf/init.raven.rc
+++ b/conf/init.raven.rc
@@ -1,8 +1,6 @@
# Raven specific init.rc
import /vendor/etc/init/hw/init.gs101.rc
-
-on init && property:ro.build.flavor=factory_raven-userdebug
- import /vendor/etc/init/hw/init.factory.rc
+import /vendor/etc/init/hw/init.raviole.rc
on init
# logbuffer
@@ -14,36 +12,10 @@
# Power Stats HAL
chown system system /sys/devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats
-on early-boot
- # Wait for insmod_sh to finish all common modules
- wait_for_prop vendor.common.modules.ready 1
- start insmod_sh_raven
-
-service insmod_sh_raven /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.raven.cfg
- class main
- user root
- group root system
- disabled
- oneshot
-
on fs
- # Fingerprint
- chown system system /dev/goodix_fp
- exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g6.app
-
# Face
exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/faceauth.app
- # LHBM
- # FIXME(b/183223359): Only grant write access to SystemUI.
- chmod 0666 /sys/class/drm/card0/card0-DSI-1/panel/backlight/panel0-backlight/local_hbm_mode
-
- # Start the twoshay touch service
- start twoshay
-
-on property:ro.revision=PROTO1.0
- setprop persist.fingerprint.ghbm true
-
on property:vendor.mfgapi.touchpanel.permission=1
chmod 0600 /sys/devices/virtual/sec/tsp/cmd
chown system system /sys/devices/virtual/sec/tsp/cmd
diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc
new file mode 100644
index 0000000..4541760
--- /dev/null
+++ b/conf/init.raviole.rc
@@ -0,0 +1,31 @@
+# Raven/Oriole specific init.rc
+
+on init && property:ro.build.flavor=factory_${ro.hardware}-userdebug
+ import /vendor/etc/init/hw/init.factory.rc
+
+on early-boot
+ # Wait for insmod_sh to finish all common modules
+ wait_for_prop vendor.common.modules.ready 1
+ start insmod_sh_raviole
+
+service insmod_sh_raviole /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg
+ class main
+ user root
+ group root system
+ disabled
+ oneshot
+
+on fs
+ # Fingerprint
+ chown system system /dev/goodix_fp
+ exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g6.app
+
+ # LHBM
+ # FIXME(b/183223359): Only grant write access to SystemUI.
+ chmod 0666 /sys/class/drm/card0/card0-DSI-1/panel/backlight/panel0-backlight/local_hbm_mode
+
+ # Start the twoshay touch service
+ start twoshay
+
+on property:ro.revision=PROTO1.0
+ setprop persist.fingerprint.ghbm true
diff --git a/device-oriole.mk b/device-oriole.mk
index 4443e6e..36c4a27 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -32,6 +32,7 @@
# Init files
PRODUCT_COPY_FILES += \
+ device/google/raviole/conf/init.raviole.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.raviole.rc \
device/google/raviole/conf/init.oriole.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.oriole.rc
# Recovery files
diff --git a/device-raven.mk b/device-raven.mk
index 89074de..c80ba10 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -38,6 +38,7 @@
# Init files
PRODUCT_COPY_FILES += \
+ device/google/raviole/conf/init.raviole.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.raviole.rc \
device/google/raviole/conf/init.raven.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.raven.rc
# Recovery files