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

Commit 61fc11ac authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Optimize: Reduce vendor target build files" into main am: 95feb949 

Original change: https://android-review.googlesource.com/c/platform/build/+/3235583



Change-Id: I255a2d9269d384da754fe0559ba5fd55f78a9016
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 17874e02 95feb949

core/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -3416,8 +3416,10 @@ endif # PRODUCT_FSVERITY_GENERATE_METADATA 
# system image



INSTALLED_FILES_OUTSIDE_IMAGES := $(filter-out $(TARGET_OUT)/%, $(INSTALLED_FILES_OUTSIDE_IMAGES))

ifdef BUILDING_SYSTEM_IMAGE

INTERNAL_SYSTEMIMAGE_FILES := $(sort $(filter $(TARGET_OUT)/%, \

    $(ALL_DEFAULT_INSTALLED_MODULES)))

endif



# Create symlink /system/vendor to /vendor if necessary.

ifdef BOARD_USES_VENDORIMAGE
@@ -3674,10 +3676,10 @@ platform-java: 
# -----------------------------------------------------------------

# data partition image

INSTALLED_FILES_OUTSIDE_IMAGES := $(filter-out $(TARGET_OUT_DATA)/%, $(INSTALLED_FILES_OUTSIDE_IMAGES))

ifdef BUILDING_USERDATA_IMAGE

INTERNAL_USERDATAIMAGE_FILES := \

    $(filter $(TARGET_OUT_DATA)/%,$(ALL_DEFAULT_INSTALLED_MODULES))



ifdef BUILDING_USERDATA_IMAGE

userdataimage_intermediates := \

    $(call intermediates-dir-for,PACKAGING,userdata)

BUILT_USERDATAIMAGE_TARGET := $(PRODUCT_OUT)/userdata.img

core/main.mk

+5 −0
Original line number Diff line number Diff line
@@ -1860,6 +1860,11 @@ ifndef INSTALLED_RECOVERYIMAGE_TARGET 
filter_out_files += $(PRODUCT_OUT)/recovery/%

endif



# userdata.img

ifndef BUILDING_USERDATA_IMAGE

filter_out_files += $(PRODUCT_OUT)/data/%

endif



installed_files := $(sort $(filter-out $(filter_out_files),$(filter $(PRODUCT_OUT)/%,$(modules_to_install))))

else

installed_files := $(apps_only_installed_files)