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

Commit 3808024d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Concat INTERNAL_*IMAGE_FILES into INTERNAL_ALLIMAGES_FILES" am: 75c4e348 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92b74fbd5a455fedd40b5237064c2030090df751
parents 1cc806ec 75c4e348

core/Makefile

+17 −37
Original line number Diff line number Diff line
@@ -3744,6 +3744,18 @@ endif # BUILDING_VBMETA_IMAGE 


endif # BOARD_AVB_ENABLE



# List of files from all images

INTERNAL_ALLIMAGES_FILES := \

    $(FULL_SYSTEMIMAGE_DEPS) \

    $(INTERNAL_RAMDISK_FILES) \

    $(INTERNAL_USERDATAIMAGE_FILES) \

    $(INTERNAL_VENDORIMAGE_FILES) \

    $(INTERNAL_PRODUCTIMAGE_FILES) \

    $(INTERNAL_SYSTEM_EXTIMAGE_FILES) \

    $(INTERNAL_ODMIMAGE_FILES) \

    $(INTERNAL_VENDOR_DLKMIMAGE_FILES) \

    $(INTERNAL_ODM_DLKMIMAGE_FILES) \



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

# Check VINTF of build
@@ -3762,13 +3774,7 @@ check_vintf_common_srcs_patterns := \ 
  $(TARGET_OUT_PRODUCT)/etc/vintf/% \

  $(TARGET_OUT_SYSTEM_EXT)/etc/vintf/% \



check_vintf_common_srcs := $(sort $(filter $(check_vintf_common_srcs_patterns), \

  $(INTERNAL_SYSTEMIMAGE_FILES) \

  $(INTERNAL_VENDORIMAGE_FILES) \

  $(INTERNAL_ODMIMAGE_FILES) \

  $(INTERNAL_PRODUCTIMAGE_FILES) \

  $(INTERNAL_SYSTEM_EXTIMAGE_FILES) \

))

check_vintf_common_srcs := $(sort $(filter $(check_vintf_common_srcs_patterns),$(INTERNAL_ALLIMAGES_FILES)))

check_vintf_common_srcs_patterns :=



check_vintf_has_system :=
@@ -5138,16 +5144,7 @@ name := $(name)-symbols-$(FILE_NAME_TAG) 
SYMBOLS_ZIP := $(PRODUCT_OUT)/$(name).zip

# For apps_only build we'll establish the dependency later in build/make/core/main.mk.

ifeq (,$(TARGET_BUILD_UNBUNDLED))

$(SYMBOLS_ZIP): $(FULL_SYSTEMIMAGE_DEPS) \

	    $(INTERNAL_RAMDISK_FILES) \

	    $(INTERNAL_USERDATAIMAGE_FILES) \

	    $(INTERNAL_VENDORIMAGE_FILES) \

	    $(INTERNAL_PRODUCTIMAGE_FILES) \

	    $(INTERNAL_SYSTEM_EXTIMAGE_FILES) \

	    $(INTERNAL_ODMIMAGE_FILES) \

	    $(INTERNAL_VENDOR_DLKMIMAGE_FILES) \

	    $(INTERNAL_ODM_DLKMIMAGE_FILES) \

	    $(updater_dep)

$(SYMBOLS_ZIP): $(INTERNAL_ALLIMAGES_FILES) $(updater_dep)

endif

$(SYMBOLS_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,symbols)/filelist

$(SYMBOLS_ZIP): $(SOONG_ZIP)
@@ -5165,15 +5162,7 @@ name := $(name)_debug 
endif

COVERAGE_ZIP := $(PRODUCT_OUT)/$(name).zip

ifeq (,$(TARGET_BUILD_UNBUNDLED))

$(COVERAGE_ZIP): $(FULL_SYSTEMIMAGE_DEPS) \

	    $(INTERNAL_RAMDISK_FILES) \

	    $(INTERNAL_USERDATAIMAGE_FILES) \

	    $(INTERNAL_VENDORIMAGE_FILES) \

	    $(INTERNAL_PRODUCTIMAGE_FILES) \

	    $(INTERNAL_SYSTEM_EXTIMAGE_FILES) \

	    $(INTERNAL_ODMIMAGE_FILES) \

	    $(INTERNAL_VENDOR_DLKMIMAGE_FILES) \

	    $(INTERNAL_ODM_DLKMIMAGE_FILES)

$(COVERAGE_ZIP): $(INTERNAL_ALLIMAGES_FILES)

endif

$(COVERAGE_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,coverage)/filelist

$(COVERAGE_ZIP): $(SOONG_ZIP)
@@ -5232,6 +5221,7 @@ $(JACOCO_REPORT_CLASSES_ALL) : 
	find $(TARGET_COMMON_OUT_ROOT) $(HOST_COMMON_OUT_ROOT) -name "jacoco-report-classes.jar" -o -name "proguard_usage.zip" 2>/dev/null | sort > $@.list

	$(SOONG_ZIP) -o $@ -L 0 -C $(OUT_DIR) -P out -l $@.list



$(JACOCO_REPORT_CLASSES_ALL): $(INTERNAL_ALLIMAGES_FILES)

endif # EMMA_INSTRUMENT=true
@@ -5241,17 +5231,7 @@ endif # EMMA_INSTRUMENT=true 
PROGUARD_DICT_ZIP := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-dict-$(FILE_NAME_TAG).zip

# For apps_only build we'll establish the dependency later in build/make/core/main.mk.

ifeq (,$(TARGET_BUILD_UNBUNDLED))

$(PROGUARD_DICT_ZIP): \

    $(FULL_SYSTEMIMAGE_DEPS) \

    $(INTERNAL_RAMDISK_FILES) \

    $(INTERNAL_USERDATAIMAGE_FILES) \

    $(INTERNAL_VENDORIMAGE_FILES) \

    $(INTERNAL_PRODUCTIMAGE_FILES) \

    $(INTERNAL_SYSTEM_EXTIMAGE_FILES) \

    $(INTERNAL_ODMIMAGE_FILES) \

    $(INTERNAL_VENDOR_DLKMIMAGE_FILES) \

    $(INTERNAL_ODM_DLKMIMAGE_FILES) \

    $(updater_dep)

$(PROGUARD_DICT_ZIP): $(INTERNAL_ALLIMAGES_FILES) $(updater_dep)

endif

$(PROGUARD_DICT_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,proguard)/filelist

$(PROGUARD_DICT_ZIP): $(SOONG_ZIP)

core/main.mk

+0 −1
Original line number Diff line number Diff line
@@ -1746,7 +1746,6 @@ else ifeq (,$(TARGET_BUILD_UNBUNDLED)) 
  endif



  ifeq ($(EMMA_INSTRUMENT),true)

    $(JACOCO_REPORT_CLASSES_ALL) : $(filter-out $(TARGET_OUT_FAKE)/%,$(modules_to_install))

    $(call dist-for-goals, dist_files, $(JACOCO_REPORT_CLASSES_ALL))

  endif