From 15c6a436bf8bc4da120d539a06ce079f2ee17d85 Mon Sep 17 00:00:00 2001 From: Zheng Pan Date: Thu, 16 Nov 2023 16:43:49 -0800 Subject: [PATCH] Load init.rc based on SOC P24 proto devices use zuma and devices starting from EVT use zumapro Init should load proper init.rc based on SOC Bug: 311016628 Test: flash KM4 proto and make sure init.zuma.rc is loaded. Change-Id: I3d0bef4ad23cb3f0cda527934e09252a8d34e35a --- conf/init.caiman.rc | 2 +- conf/init.komodo.rc | 4 ++-- conf/init.tokay.rc | 4 ++-- device-caimito-common.mk | 4 ++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/conf/init.caiman.rc b/conf/init.caiman.rc index 7bcd45f2..05ecd338 100644 --- a/conf/init.caiman.rc +++ b/conf/init.caiman.rc @@ -1,5 +1,5 @@ # Caiman specific init.rc -import /vendor/etc/init/hw/init.zumapro.rc +import /vendor/etc/init/hw/init.${ro.boot.hardware.platform}.rc on init && property:ro.vendor.factory=1 import /vendor/etc/init/hw/init.factory.rc diff --git a/conf/init.komodo.rc b/conf/init.komodo.rc index 195b7792..31efc2a3 100644 --- a/conf/init.komodo.rc +++ b/conf/init.komodo.rc @@ -1,5 +1,5 @@ # Komodo specific init.rc -import /vendor/etc/init/hw/init.zumapro.rc +import /vendor/etc/init/hw/init.${ro.boot.hardware.platform}.rc on init && property:ro.vendor.factory=1 import /vendor/etc/init/hw/init.factory.rc @@ -44,4 +44,4 @@ on late-init && property:ro.boot.hardware.revision=PROTO1.0 setprop vendor.thermal.config "thermal_info_config_proto.json" on late-init && property:ro.boot.hardware.revision=PROTO1.1 - setprop vendor.thermal.config "thermal_info_config_proto.json" \ No newline at end of file + setprop vendor.thermal.config "thermal_info_config_proto.json" diff --git a/conf/init.tokay.rc b/conf/init.tokay.rc index ddca7722..613f12de 100644 --- a/conf/init.tokay.rc +++ b/conf/init.tokay.rc @@ -1,5 +1,5 @@ # Tokay specific init.rc -import /vendor/etc/init/hw/init.zumapro.rc +import /vendor/etc/init/hw/init.${ro.boot.hardware.platform}.rc on init && property:ro.vendor.factory=1 import /vendor/etc/init/hw/init.factory.rc @@ -44,4 +44,4 @@ on late-init && property:ro.boot.hardware.revision=PROTO1.0 setprop vendor.thermal.config "thermal_info_config_proto.json" on late-init && property:ro.boot.hardware.revision=PROTO1.1 - setprop vendor.thermal.config "thermal_info_config_proto.json" \ No newline at end of file + setprop vendor.thermal.config "thermal_info_config_proto.json" diff --git a/device-caimito-common.mk b/device-caimito-common.mk index 9bcc18ba..cce9404d 100644 --- a/device-caimito-common.mk +++ b/device-caimito-common.mk @@ -38,3 +38,7 @@ PRODUCT_COPY_FILES += \ $(TARGET_VENDOR_PERF_CONFIG_PATH)/powerhint-$(TARGET_DEVICE).json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json PRODUCT_COPY_FILES += \ $(TARGET_VENDOR_PERF_CONFIG_PATH)/powerhint-zuma.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint-proto.json + +# Copy init.p24.zuma.rc for proto devices +PRODUCT_COPY_FILES += \ + device/google/zumapro/conf/init.p24.zuma.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.rc