Only copy init.recovery.{marlin,sailfish}.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 sailfish
Change-Id: I2e8896c343b9ab50150d7700b3f013eb7bae44cf
diff --git a/CleanSpec.mk b/CleanSpec.mk
index cf800cc..b0a0a6f 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -72,3 +72,7 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/system/lib64/vndk-sp/libz.so)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk-sp/libz.so)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/vndk-sp/libz.so)
+
+# Remove init.recovery.*.rc file in root directory (only needed in recovery root).
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/init.recovery.marlin.rc)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/init.recovery.sailfish.rc)
diff --git a/device-marlin.mk b/device-marlin.mk
index 9e30e58..dd6a753 100644
--- a/device-marlin.mk
+++ b/device-marlin.mk
@@ -44,7 +44,7 @@
PRODUCT_COPY_FILES += \
device/google/marlin/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.marlin \
- device/google/marlin/init.recovery.common.rc:root/init.recovery.marlin.rc
+ device/google/marlin/init.recovery.common.rc:recovery/root/init.recovery.marlin.rc
# Sensor packages
PRODUCT_PACKAGES += \
diff --git a/device-sailfish.mk b/device-sailfish.mk
index 2127727..d955259 100644
--- a/device-sailfish.mk
+++ b/device-sailfish.mk
@@ -44,7 +44,7 @@
PRODUCT_COPY_FILES += \
device/google/marlin/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.sailfish \
- device/google/marlin/init.recovery.common.rc:root/init.recovery.sailfish.rc
+ device/google/marlin/init.recovery.common.rc:recovery/root/init.recovery.sailfish.rc
# Sensor packages
PRODUCT_PACKAGES += \
