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

Commit f13a59ae authored by Spandan Das's avatar Spandan Das Committed by Gerrit Code Review
Browse files

Merge changes from topic "soong_export_systemimage_path" into main 

* changes:
  Add a stem value to handcrafted soong system images
  Remove SOONG_DEFINED_SYSTEM_IMAGE_PATH
parents be4f8479 c5dd97bf

core/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -3594,7 +3594,6 @@ ifeq ($(USE_SOONG_DEFINED_SYSTEM_IMAGE),true) 
ifeq ($(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE),)

ifeq ($(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE),)

$(error PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE must be set if USE_SOONG_DEFINED_SYSTEM_IMAGE is true)

$(error PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE must be set if USE_SOONG_DEFINED_SYSTEM_IMAGE is true)

endif

endif

SOONG_DEFINED_SYSTEM_IMAGE_PATH := $(call intermediates-dir-for,ETC,$(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE))/$(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE)

SOONG_DEFINED_SYSTEM_IMAGE_BASE := $(dir $(ALL_MODULES.$(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE).FILESYSTEM_FILELIST))

SOONG_DEFINED_SYSTEM_IMAGE_BASE := $(dir $(ALL_MODULES.$(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE).FILESYSTEM_FILELIST))

$(BUILT_SYSTEMIMAGE): $(FULL_SYSTEMIMAGE_DEPS) $(INSTALLED_FILES_FILE) $(systemimage_intermediates)/file_list.txt $(SOONG_DEFINED_SYSTEM_IMAGE_PATH)

$(BUILT_SYSTEMIMAGE): $(FULL_SYSTEMIMAGE_DEPS) $(INSTALLED_FILES_FILE) $(systemimage_intermediates)/file_list.txt $(SOONG_DEFINED_SYSTEM_IMAGE_PATH)

$(eval $(call copy-one-file, $(SOONG_DEFINED_SYSTEM_IMAGE_PATH), $(BUILT_SYSTEMIMAGE)))

$(eval $(call copy-one-file, $(SOONG_DEFINED_SYSTEM_IMAGE_PATH), $(BUILT_SYSTEMIMAGE)))

target/product/generic/Android.bp

+2 −0
Original line number Original line Diff line number Diff line
@@ -468,6 +468,8 @@ system_image_defaults { 
    name: "system_image_defaults",

    name: "system_image_defaults",

    partition_name: "system",

    partition_name: "system",

    base_dir: "system",

    base_dir: "system",

    stem: "system.img",

    no_full_install: true,

    dirs: generic_rootdirs,

    dirs: generic_rootdirs,

    soong_config_variables: {

    soong_config_variables: {

        TARGET_ADD_ROOT_EXTRA_VENDOR_SYMLINKS: {

        TARGET_ADD_ROOT_EXTRA_VENDOR_SYMLINKS: {