Merge "Use soong modules for init.*.rc" into main

This commit is contained in:
Jeongik Cha 2024-03-18 01:25:16 +00:00 committed by Gerrit Code Review
commit 784f2a899c
4 changed files with 8 additions and 11 deletions

View file

@ -420,13 +420,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

View file

@ -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

View file

@ -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

View file

@ -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