From 4a6503bf5261c3415fb859a818fd7b6cda2be9b9 Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Tue, 26 Sep 2017 15:58:54 +0800 Subject: [PATCH] Only copy init.recovery.$(PRODUCT_HARDWARE).rc to recovery root Currently it's copied to normal root, for build system to copy init.recovery.*.rc to recovery root. However, with the following fix from AOSP, this isn't needed. We can only copy init.recovery.*.rc to recovery root. https://android-review.googlesource.com/#/c/platform/build/+/493017/ Bug: 65570851 Test: recovery/normal boot the device Change-Id: I9e996a8ed30775ed633ed8ec3fc0b7b9970ff0fb --- CleanSpec.mk | 3 +++ device.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index af32e90a..8e6689f7 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -143,3 +143,6 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/vndk-sp/libz.so) # Remove eSIM OTA image $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/EuiccGoogle/esim.img) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/EuiccGoogle/esim2.img) + +# Remove init.recovery.*.rc file in root directory (only needed in recovery root). +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/init.recovery.$(PRODUCT_HARDWARE).rc) diff --git a/device.mk b/device.mk index 2ea35376..5ee1829e 100755 --- a/device.mk +++ b/device.mk @@ -55,7 +55,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay PRODUCT_COPY_FILES += \ $(LOCAL_KERNEL):kernel \ - $(LOCAL_PATH)/init.recovery.hardware.rc:root/init.recovery.$(PRODUCT_HARDWARE).rc \ + $(LOCAL_PATH)/init.recovery.hardware.rc:recovery/root/init.recovery.$(PRODUCT_HARDWARE).rc \ $(LOCAL_PATH)/init.hardware.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_HARDWARE).rc \ $(LOCAL_PATH)/init.hardware.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.wahoo.usb.rc \ $(LOCAL_PATH)/ueventd.hardware.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \