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
This commit is contained in:
Bowgo Tsai
2017-09-26 15:58:54 +08:00
parent b8d57c974a
commit 4a6503bf52
2 changed files with 4 additions and 1 deletions

View File

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

View File

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