StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move init and ueventd scripts from / to /system/etc"

Browse Source
This commit is contained in:
Tom Cherry
2019-11-13 14:36:47 +00:00
committed by Gerrit Code Review
parent 9651113f02 89eea96fe1
commit 4f51fba546
5 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/Makefile
View File

@@ -1733,7 +1733,6 @@ $(INSTALLED_FILES_FILE_RECOVERY): $(INTERNAL_RECOVERYIMAGE_FILES) $(FILESLIST) $
$(hide) $(FILESLIST) $(TARGET_RECOVERY_ROOT_OUT) > $(@:.txt=.json) $(hide) $(FILESLIST) $(TARGET_RECOVERY_ROOT_OUT) > $(@:.txt=.json)
$(hide) $(FILESLIST_UTIL) -c $(@:.txt=.json) > $@ $(hide) $(FILESLIST_UTIL) -c $(@:.txt=.json) > $@
recovery_initrc := $(call include-path-for, recovery)/etc/init.rc
recovery_sepolicy := \ recovery_sepolicy := \
$(TARGET_RECOVERY_ROOT_OUT)/sepolicy \ $(TARGET_RECOVERY_ROOT_OUT)/sepolicy \
$(TARGET_RECOVERY_ROOT_OUT)/plat_file_contexts \ $(TARGET_RECOVERY_ROOT_OUT)/plat_file_contexts \
@@ -2027,7 +2026,6 @@ define build-recoveryimage-target
$(hide) ln -sf /system/bin/init $(TARGET_RECOVERY_ROOT_OUT)/init) $(hide) ln -sf /system/bin/init $(TARGET_RECOVERY_ROOT_OUT)/init)
# Removes $(TARGET_RECOVERY_ROOT_OUT)/init*.rc EXCEPT init.recovery*.rc. # Removes $(TARGET_RECOVERY_ROOT_OUT)/init*.rc EXCEPT init.recovery*.rc.
$(hide) find $(TARGET_RECOVERY_ROOT_OUT) -maxdepth 1 -name 'init*.rc' -type f -not -name "init.recovery.*.rc" | xargs rm -f $(hide) find $(TARGET_RECOVERY_ROOT_OUT) -maxdepth 1 -name 'init*.rc' -type f -not -name "init.recovery.*.rc" | xargs rm -f
$(hide) cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/
$(hide) cp $(TARGET_ROOT_OUT)/init.recovery.*.rc $(TARGET_RECOVERY_ROOT_OUT)/ 2> /dev/null || true # Ignore error when the src file doesn't exist. $(hide) cp $(TARGET_ROOT_OUT)/init.recovery.*.rc $(TARGET_RECOVERY_ROOT_OUT)/ 2> /dev/null || true # Ignore error when the src file doesn't exist.
$(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/res $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/res
$(hide) rm -rf $(TARGET_RECOVERY_ROOT_OUT)/res/* $(hide) rm -rf $(TARGET_RECOVERY_ROOT_OUT)/res/*
@@ -2092,7 +2090,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \
$(INTERNAL_ROOT_FILES) \ $(INTERNAL_ROOT_FILES) \
$(INSTALLED_RAMDISK_TARGET) \ $(INSTALLED_RAMDISK_TARGET) \
$(INTERNAL_RECOVERYIMAGE_FILES) \ $(INTERNAL_RECOVERYIMAGE_FILES) \
$(recovery_initrc) $(recovery_sepolicy) $(recovery_kernel) \ $(recovery_sepolicy) $(recovery_kernel) \
$(INSTALLED_2NDBOOTLOADER_TARGET) \ $(INSTALLED_2NDBOOTLOADER_TARGET) \
$(INSTALLED_RECOVERY_BUILD_PROP_TARGET) \ $(INSTALLED_RECOVERY_BUILD_PROP_TARGET) \
$(recovery_resource_deps) \ $(recovery_resource_deps) \
@@ -2120,7 +2118,7 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \
$(INSTALLED_RAMDISK_TARGET) \ $(INSTALLED_RAMDISK_TARGET) \
$(INSTALLED_BOOTIMAGE_TARGET) \ $(INSTALLED_BOOTIMAGE_TARGET) \
$(INTERNAL_RECOVERYIMAGE_FILES) \ $(INTERNAL_RECOVERYIMAGE_FILES) \
$(recovery_initrc) $(recovery_sepolicy) $(recovery_kernel) \ $(recovery_sepolicy) $(recovery_kernel) \
$(INSTALLED_2NDBOOTLOADER_TARGET) \ $(INSTALLED_2NDBOOTLOADER_TARGET) \
$(INSTALLED_RECOVERY_BUILD_PROP_TARGET) \ $(INSTALLED_RECOVERY_BUILD_PROP_TARGET) \
$(recovery_resource_deps) \ $(recovery_resource_deps) \

8
target/product/base_system.mk
View File

@@ -99,7 +99,6 @@ PRODUCT_PACKAGES += \
incidentd \ incidentd \
incident_helper \ incident_helper \
init.environ.rc \ init.environ.rc \
init.rc \
init_system \ init_system \
input \ input \
installd \ installd \
@@ -329,9 +328,8 @@ PRODUCT_UPDATABLE_BOOT_LOCATIONS := \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
system/core/rootdir/init.usb.rc:root/init.usb.rc \ system/core/rootdir/init.usb.rc:system/etc/init/hw/init.usb.rc \
system/core/rootdir/init.usb.configfs.rc:root/init.usb.configfs.rc \ system/core/rootdir/init.usb.configfs.rc:system/etc/init/hw/init.usb.configfs.rc \
system/core/rootdir/ueventd.rc:root/ueventd.rc \
system/core/rootdir/etc/hosts:system/etc/hosts system/core/rootdir/etc/hosts:system/etc/hosts
# Add the compatibility library that is needed when android.test.base # Add the compatibility library that is needed when android.test.base
@@ -344,7 +342,7 @@ else
PRODUCT_BOOT_JARS += android.test.base PRODUCT_BOOT_JARS += android.test.base
endif endif
PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32.rc:root/init.zygote32.rc PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32.rc:system/etc/init/hw/init.zygote32.rc
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote32 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote32
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += debug.atrace.tags.enableflags=0 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += debug.atrace.tags.enableflags=0

2
target/product/core_64_bit.mk
View File

@@ -23,7 +23,7 @@
# for 32-bit only. # for 32-bit only.
# Copy the 64-bit primary, 32-bit secondary zygote startup script # Copy the 64-bit primary, 32-bit secondary zygote startup script
PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:system/etc/init/hw/init.zygote64_32.rc
# Set the zygote property to select the 64-bit primary, 32-bit secondary script # 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 # This line must be parsed before the one in core_minimal.mk

2
target/product/core_64_bit_only.mk
View File

@@ -20,7 +20,7 @@
# to core_minimal.mk. # to core_minimal.mk.
# Copy the 64-bit zygote startup script # Copy the 64-bit zygote startup script
PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64.rc:root/init.zygote64.rc PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64.rc:system/etc/init/hw/init.zygote64.rc
# Set the zygote property to select the 64-bit script. # Set the zygote property to select the 64-bit script.
# This line must be parsed before the one in core_minimal.mk # This line must be parsed before the one in core_minimal.mk

8
target/product/mainline_system.mk
View File

@@ -112,10 +112,10 @@ PRODUCT_HOST_PACKAGES += \
# Include all zygote init scripts. "ro.zygote" will select one of them. # Include all zygote init scripts. "ro.zygote" will select one of them.
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
system/core/rootdir/init.zygote32.rc:root/init.zygote32.rc \ system/core/rootdir/init.zygote32.rc:system/etc/init/hw/init.zygote32.rc \
system/core/rootdir/init.zygote64.rc:root/init.zygote64.rc \ system/core/rootdir/init.zygote64.rc:system/etc/init/hw/init.zygote64.rc \
system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc \ system/core/rootdir/init.zygote32_64.rc:system/etc/init/hw/init.zygote32_64.rc \
system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc system/core/rootdir/init.zygote64_32.rc:system/etc/init/hw/init.zygote64_32.rc \
# Enable dynamic partition size # Enable dynamic partition size
PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true