StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix generic ramdisk build failures on dedicated recovery partitions" am: 2797146c86

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2388833

Change-Id: Ia3fff9e16c204c846c1600c9cdcb83dc39bac027
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-01-18 20:24:56 +00:00
committed by Automerger Merge Worker
parent 71ca6b2e7a 2797146c86
commit 621e9cc599
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/base_rules.mk
View File

@@ -600,7 +600,11 @@ ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))
# Manually handle the case where the
# output file is in the recovery or ramdisk partition.
ifneq (,$(filter $(TARGET_RECOVERY_ROOT_OUT)/%,$(my_module_path)))
my_init_rc_path := $(TARGET_RECOVERY_ROOT_OUT)/system/etc
ifneq (,$(filter $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/%,$(my_module_path)))
my_init_rc_path := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/system/etc
else
my_init_rc_path := $(TARGET_RECOVERY_ROOT_OUT)/system/etc
endif
else ifneq (,$(filter $(TARGET_RAMDISK_OUT)/%,$(my_module_path)))
my_init_rc_path := $(TARGET_RAMDISK_OUT)/system/etc
else

5
target/product/generic_ramdisk.mk
View File

@@ -29,11 +29,16 @@ PRODUCT_PACKAGES += \
adb_debug.prop \
userdebug_plat_sepolicy.cil \
# For targets using dedicated recovery partition, generic ramdisk
# might be relocated to recovery partition
_my_paths := \
$(TARGET_COPY_OUT_RAMDISK)/ \
$(TARGET_COPY_OUT_DEBUG_RAMDISK)/ \
system/usr/share/zoneinfo/tz_version \
system/usr/share/zoneinfo/tzdata \
$(TARGET_COPY_OUT_RECOVERY)/root/first_stage_ramdisk/system \
# We use the "relaxed" version here because tzdata / tz_version is only produced
# by this makefile on a subset of devices.