Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f51fba5 authored by Tom Cherry's avatar Tom Cherry Committed by Gerrit Code Review
Browse files

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

parents 9651113f 89eea96f

core/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -1733,7 +1733,6 @@ $(INSTALLED_FILES_FILE_RECOVERY): $(INTERNAL_RECOVERYIMAGE_FILES) $(FILESLIST) $ 
	$(hide) $(FILESLIST) $(TARGET_RECOVERY_ROOT_OUT) > $(@:.txt=.json)

	$(hide) $(FILESLIST_UTIL) -c $(@:.txt=.json) > $@



recovery_initrc := $(call include-path-for, recovery)/etc/init.rc

recovery_sepolicy := \

    $(TARGET_RECOVERY_ROOT_OUT)/sepolicy \

    $(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)

  # 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) 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) mkdir -p $(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) \

	    $(INSTALLED_RAMDISK_TARGET) \

	    $(INTERNAL_RECOVERYIMAGE_FILES) \

	    $(recovery_initrc) $(recovery_sepolicy) $(recovery_kernel) \

	    $(recovery_sepolicy) $(recovery_kernel) \

	    $(INSTALLED_2NDBOOTLOADER_TARGET) \

	    $(INSTALLED_RECOVERY_BUILD_PROP_TARGET) \

	    $(recovery_resource_deps) \
@@ -2120,7 +2118,7 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \ 
	    $(INSTALLED_RAMDISK_TARGET) \

	    $(INSTALLED_BOOTIMAGE_TARGET) \

	    $(INTERNAL_RECOVERYIMAGE_FILES) \

	    $(recovery_initrc) $(recovery_sepolicy) $(recovery_kernel) \

	    $(recovery_sepolicy) $(recovery_kernel) \

	    $(INSTALLED_2NDBOOTLOADER_TARGET) \

	    $(INSTALLED_RECOVERY_BUILD_PROP_TARGET) \

	    $(recovery_resource_deps) \

target/product/base_system.mk

+3 −5
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ PRODUCT_PACKAGES += \ 
    incidentd \

    incident_helper \

    init.environ.rc \

    init.rc \

    init_system \

    input \

    installd \
@@ -329,9 +328,8 @@ PRODUCT_UPDATABLE_BOOT_LOCATIONS := \ 




PRODUCT_COPY_FILES += \

    system/core/rootdir/init.usb.rc:root/init.usb.rc \

    system/core/rootdir/init.usb.configfs.rc:root/init.usb.configfs.rc \

    system/core/rootdir/ueventd.rc:root/ueventd.rc \

    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



# Add the compatibility library that is needed when android.test.base
@@ -344,7 +342,7 @@ else 
PRODUCT_BOOT_JARS += android.test.base

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_SYSTEM_DEFAULT_PROPERTIES += debug.atrace.tags.enableflags=0

target/product/core_64_bit.mk

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +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_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

# This line must be parsed before the one in core_minimal.mk

target/product/core_64_bit_only.mk

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
# to core_minimal.mk.



# 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.

# This line must be parsed before the one in core_minimal.mk

target/product/mainline_system.mk

+4 −4
Original line number Diff line number Diff line
@@ -112,10 +112,10 @@ PRODUCT_HOST_PACKAGES += \ 


# Include all zygote init scripts. "ro.zygote" will select one of them.

PRODUCT_COPY_FILES += \

    system/core/rootdir/init.zygote32.rc:root/init.zygote32.rc \

    system/core/rootdir/init.zygote64.rc:root/init.zygote64.rc \

    system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc \

    system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc

    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.zygote32_64.rc:system/etc/init/hw/init.zygote32_64.rc \

    system/core/rootdir/init.zygote64_32.rc:system/etc/init/hw/init.zygote64_32.rc \



# Enable dynamic partition size

PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true