aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlambdadroid <lambdadroid@gmail.com>2019-04-21 14:13:33 (GMT)
committerlambdadroid <lambdadroid@gmail.com>2019-05-08 16:57:18 (GMT)
commit87e92211028dafbc7359dddf4d7c2c1ee0c501ff (patch)
treeedfd7b4f553ec6a4040aeee0d643eaa4485f159e
parenta04f8be86fc4b5854fd981027d3e4f7e243f7a1f (diff)
downloadandroid_build-87e92211028dafbc7359dddf4d7c2c1ee0c501ff.zip
android_build-87e92211028dafbc7359dddf4d7c2c1ee0c501ff.tar.gz
android_build-87e92211028dafbc7359dddf4d7c2c1ee0c501ff.tar.bz2
build: Respect fs_config when generating recovery ramdiskrefs/changes/73/247773/1
Without the -d $(TARGET_OUT) option for mkbootfs, only the compiled-in fs_config (from AOSP) is used for the generated ramdisk image. Device-specific additions are ignored. This is why AOSP sets this option for both the boot- and recovery ramdisk [1]. However, the option was removed for the recovery ramdisk in https://review.lineageos.org/c/LineageOS/android_build/+/222722 This causes device-specific fs_config additions to be ignored when generating the recovery ramdisk, potentially setting the wrong permissions. [1]: https://android.googlesource.com/platform/build/+/refs/tags/android-9.0.0_r37/core/Makefile#1388 Change-Id: I0f77a49d8b2f08791e60b34ddbb6f3b32bc2f0bc
-rw-r--r--core/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile
index 6b431e2..1311167 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1548,7 +1548,7 @@ $(recovery_uncompressed_ramdisk): $(MKBOOTFS) $(ADBD) \
$(DEPMOD)
$(call build-recoveryramdisk)
@echo ----- Making uncompressed recovery ramdisk ------
- $(hide) $(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) > $@
+ $(hide) $(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_RECOVERY_ROOT_OUT) > $@
$(recovery_ramdisk): $(MINIGZIP) \
$(recovery_uncompressed_ramdisk)