Install recovery etc files to recovery/root/system/etc.
They used to be installed under recovery/root/etc. This CL moves the
files to the new location and creates a symlink from /etc to /system/etc
(done by the rule in system/core/rootdir). This gives similar layout
between normal boot and recovery, and allows installing prebuilt_etc
files with Soong (`recovery_available: true`).
As part of the change, we no longer need the whitelisting rule for
mke2fs.conf.
Bug: 112780007
Test: Build with other changes in the topic (aosp_taimen-userdebug).
Check the generated files under recovery (/etc being a symlink to
/system/etc).
Test: Boot into recovery. Verify basic functionalities (`adb shell` and
`adb sideload`, factory reset).
Test: `build/soong/build_test.bash --dist`
Change-Id: Ibb6dea6f179a339f0c2d0fd8ba05ec0085b79a12
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 4195900..e543857 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -239,11 +239,11 @@
system_root_image = d.get("system_root_image") == "true"
if d.get("no_recovery") != "true":
- recovery_fstab_path = "RECOVERY/RAMDISK/etc/recovery.fstab"
+ recovery_fstab_path = "RECOVERY/RAMDISK/system/etc/recovery.fstab"
d["fstab"] = LoadRecoveryFSTab(
read_helper, d["fstab_version"], recovery_fstab_path, system_root_image)
elif d.get("recovery_as_boot") == "true":
- recovery_fstab_path = "BOOT/RAMDISK/etc/recovery.fstab"
+ recovery_fstab_path = "BOOT/RAMDISK/system/etc/recovery.fstab"
d["fstab"] = LoadRecoveryFSTab(
read_helper, d["fstab_version"], recovery_fstab_path, system_root_image)
else: