From a865d24b5a475334d3575fc1775e1c0f4e208de6 Mon Sep 17 00:00:00 2001 From: Jeongik Cha Date: Wed, 24 Jan 2024 16:38:24 +0900 Subject: [PATCH] Use soong modules for init.*.rc Bug: 322088967 Test: build Change-Id: Ic4c9280367d7a5effab7eb2bc3b9dd07bf19a218 --- target/product/base_system.mk | 5 ++--- target/product/core_64_bit.mk | 4 +--- target/product/core_64_bit_only.mk | 2 +- target/product/generic_system.mk | 8 ++++---- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 277223e987..d7c1af85c7 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -419,13 +419,12 @@ PRODUCT_HOST_PACKAGES += \ tz_version_host \ tz_version_host_tzdata_apex \ +PRODUCT_PACKAGES += init.usb.rc init.usb.configfs.rc PRODUCT_COPY_FILES += \ - system/core/rootdir/init.usb.rc:system/etc/init/hw/init.usb.rc \ - system/core/rootdir/init.usb.configfs.rc:system/etc/init/hw/init.usb.configfs.rc \ system/core/rootdir/etc/hosts:system/etc/hosts -PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32.rc:system/etc/init/hw/init.zygote32.rc +PRODUCT_PACKAGES += init.zygote32.rc PRODUCT_VENDOR_PROPERTIES += ro.zygote?=zygote32 PRODUCT_SYSTEM_PROPERTIES += debug.atrace.tags.enableflags=0 diff --git a/target/product/core_64_bit.mk b/target/product/core_64_bit.mk index e0c4d53428..790f57b634 100644 --- a/target/product/core_64_bit.mk +++ b/target/product/core_64_bit.mk @@ -23,9 +23,7 @@ # for 32-bit only. # Copy the 64-bit primary, 32-bit secondary zygote startup script -PRODUCT_COPY_FILES += \ - system/core/rootdir/init.zygote64.rc:system/etc/init/hw/init.zygote64.rc \ - system/core/rootdir/init.zygote64_32.rc:system/etc/init/hw/init.zygote64_32.rc \ +PRODUCT_PACKAGES += init.zygote64.rc init.zygote64_32.rc # Set the zygote property to select the 64-bit primary, 32-bit secondary script # This line must be parsed before the one in core_minimal.mk diff --git a/target/product/core_64_bit_only.mk b/target/product/core_64_bit_only.mk index fc2b8e5498..ffa5567a47 100644 --- a/target/product/core_64_bit_only.mk +++ b/target/product/core_64_bit_only.mk @@ -20,7 +20,7 @@ # to core_minimal.mk. # Copy the 64-bit zygote startup script -PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64.rc:system/etc/init/hw/init.zygote64.rc +PRODUCT_PACKAGES += init.zygote64.rc # Set the zygote property to select the 64-bit script. # This line must be parsed before the one in core_minimal.mk diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk index 19ec86d8ca..fa31e04e46 100644 --- a/target/product/generic_system.mk +++ b/target/product/generic_system.mk @@ -111,10 +111,10 @@ PRODUCT_PACKAGES += \ $(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34) # Include all zygote init scripts. "ro.zygote" will select one of them. -PRODUCT_COPY_FILES += \ - system/core/rootdir/init.zygote32.rc:system/etc/init/hw/init.zygote32.rc \ - system/core/rootdir/init.zygote64.rc:system/etc/init/hw/init.zygote64.rc \ - system/core/rootdir/init.zygote64_32.rc:system/etc/init/hw/init.zygote64_32.rc \ +PRODUCT_PACKAGES += \ + init.zygote32.rc \ + init.zygote64.rc \ + init.zygote64_32.rc # Enable dynamic partition size PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true