Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2797146c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix generic ramdisk build failures on dedicated recovery partitions"

parents 854afb66 1143aaf7

core/base_rules.mk

+5 −1
Original line number Diff line number Diff line
@@ -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)))

        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

target/product/generic_ramdisk.mk

+5 −0
Original line number Diff line number Diff line
@@ -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.