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

Commit c2880832 authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

Merge "Build ramdisk's build.prop with soong" into main

parents 22355b09 5f84cf72

core/sysprop.mk

+4 −14
Original line number Diff line number Diff line
@@ -301,22 +301,12 @@ ALL_DEFAULT_INSTALLED_MODULES += \ 


INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET := $(TARGET_OUT_SYSTEM_EXT)/etc/build.prop



# ----------------------------------------------------------------

# ramdisk/boot/etc/build.prop

#



RAMDISK_BUILD_PROP_REL_PATH := system/etc/ramdisk/build.prop

ifeq (true,$(BOARD_USES_RECOVERY_AS_BOOT))

INSTALLED_RAMDISK_BUILD_PROP_TARGET := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/$(RAMDISK_BUILD_PROP_REL_PATH)

else

INSTALLED_RAMDISK_BUILD_PROP_TARGET := $(TARGET_RAMDISK_OUT)/$(RAMDISK_BUILD_PROP_REL_PATH)

$(eval $(call build-properties,\

    bootimage,\

    $(INSTALLED_RAMDISK_BUILD_PROP_TARGET),\

    $(empty),\

    $(empty),\

    $(empty),\

    $(empty),\

    $(empty)))



$(eval $(call declare-1p-target,$(INSTALLED_RAMDISK_BUILD_PROP_TARGET)))

endif



ALL_INSTALLED_BUILD_PROP_FILES := \

  $(INSTALLED_BUILD_PROP_TARGET) \

target/product/generic_ramdisk.mk

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
PRODUCT_PACKAGES += \

    init_first_stage \

    snapuserd_ramdisk \

    ramdisk-build.prop \



# Debug ramdisk

PRODUCT_PACKAGES += \