Remove unused dependencies from sdk goals
The SDK no longer includes system images, so no longer needs to depend on targets that are only relevant for the system images. Remove all the explicit dependencies that end up depending on "everything" but are not included in the sdk zip. Two positive side-effects: - fewer unused things get built (now ~32k targets, down from ~108k) - apexes no longer get built, eliminating the risk of mismatch between module sdk prebuilts and source-built AOSP apexes. There are some potential risks with this CL: - because we no longer forcefully rebuild everything, if there are bugs in dependencies of exising files in the SDK, incremental builds may not rebuild them. - some files that get built into the SDK may be being built as a side-effect of other files included in the SDK, so removing one file may cause another to not get built. The solution to that is to add the file not getting built to ALL_SDK_FILES. Bug: 205008975 Test: m sdk sdk_repo dist && diff sdk.zip before/after (identical) Change-Id: I97284864f66aa88556fbe16864f45b04be97634e
This commit is contained in:
parent
8ccac5198d
commit
55a8f02ea8
2 changed files with 1 additions and 29 deletions
|
@ -842,10 +842,6 @@ $(INSTALLED_FILES_FILE_ROOT) : $(INTERNAL_ROOT_FILES) $(FILESLIST) $(FILESLIST_U
|
||||||
$(call declare-0p-target,$(INSTALLED_FILES_FILE_ROOT))
|
$(call declare-0p-target,$(INSTALLED_FILES_FILE_ROOT))
|
||||||
$(call declare-0p-target,$(INSTALLED_FILES_JSON_ROOT))
|
$(call declare-0p-target,$(INSTALLED_FILES_JSON_ROOT))
|
||||||
|
|
||||||
ifeq ($(HOST_OS),linux)
|
|
||||||
$(call dist-for-goals, sdk sdk_addon, $(INSTALLED_FILES_FILE_ROOT))
|
|
||||||
endif
|
|
||||||
|
|
||||||
#------------------------------------------------------------------
|
#------------------------------------------------------------------
|
||||||
# dtb
|
# dtb
|
||||||
ifdef BOARD_INCLUDE_DTB_IN_BOOTIMG
|
ifdef BOARD_INCLUDE_DTB_IN_BOOTIMG
|
||||||
|
@ -877,9 +873,6 @@ $(INSTALLED_FILES_FILE_RAMDISK) : $(INTERNAL_RAMDISK_FILES) $(FILESLIST) $(FILES
|
||||||
$(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE_RAMDISK)))
|
$(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE_RAMDISK)))
|
||||||
$(eval $(call declare-0p-target,$(INSTALLED_FILES_JSON_RAMDISK)))
|
$(eval $(call declare-0p-target,$(INSTALLED_FILES_JSON_RAMDISK)))
|
||||||
|
|
||||||
ifeq ($(HOST_OS),linux)
|
|
||||||
$(call dist-for-goals, sdk sdk_addon, $(INSTALLED_FILES_FILE_RAMDISK))
|
|
||||||
endif
|
|
||||||
BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img
|
BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img
|
||||||
|
|
||||||
ifeq ($(BOARD_RAMDISK_USE_LZ4),true)
|
ifeq ($(BOARD_RAMDISK_USE_LZ4),true)
|
||||||
|
@ -3108,10 +3101,6 @@ $(eval $(call declare-0p-target,$(INSTALLED_FILES_JSON)))
|
||||||
.PHONY: installed-file-list
|
.PHONY: installed-file-list
|
||||||
installed-file-list: $(INSTALLED_FILES_FILE)
|
installed-file-list: $(INSTALLED_FILES_FILE)
|
||||||
|
|
||||||
ifeq ($(HOST_OS),linux)
|
|
||||||
$(call dist-for-goals, sdk sdk_addon, $(INSTALLED_FILES_FILE))
|
|
||||||
endif
|
|
||||||
|
|
||||||
systemimage_intermediates := \
|
systemimage_intermediates := \
|
||||||
$(call intermediates-dir-for,PACKAGING,systemimage)
|
$(call intermediates-dir-for,PACKAGING,systemimage)
|
||||||
BUILT_SYSTEMIMAGE := $(systemimage_intermediates)/system.img
|
BUILT_SYSTEMIMAGE := $(systemimage_intermediates)/system.img
|
||||||
|
@ -6798,8 +6787,6 @@ ATREE_FILES :=
|
||||||
# if we don't have a real list, then use "everything"
|
# if we don't have a real list, then use "everything"
|
||||||
ifeq ($(strip $(ATREE_FILES)),)
|
ifeq ($(strip $(ATREE_FILES)),)
|
||||||
ATREE_FILES := \
|
ATREE_FILES := \
|
||||||
$(ALL_DEFAULT_INSTALLED_MODULES) \
|
|
||||||
$(INSTALLED_RAMDISK_TARGET) \
|
|
||||||
$(ALL_DOCS) \
|
$(ALL_DOCS) \
|
||||||
$(ALL_SDK_FILES)
|
$(ALL_SDK_FILES)
|
||||||
endif
|
endif
|
||||||
|
@ -6828,18 +6815,7 @@ include $(BUILD_SYSTEM)/sdk_font.mk
|
||||||
deps := \
|
deps := \
|
||||||
$(OUT_DOCS)/offline-sdk-timestamp \
|
$(OUT_DOCS)/offline-sdk-timestamp \
|
||||||
$(SDK_METADATA_FILES) \
|
$(SDK_METADATA_FILES) \
|
||||||
$(SYMBOLS_ZIP) \
|
$(INSTALLED_SDK_BUILD_PROP_TARGET) \
|
||||||
$(COVERAGE_ZIP) \
|
|
||||||
$(APPCOMPAT_ZIP) \
|
|
||||||
$(INSTALLED_SYSTEMIMAGE_TARGET) \
|
|
||||||
$(INSTALLED_QEMU_SYSTEMIMAGE) \
|
|
||||||
$(INSTALLED_QEMU_RAMDISKIMAGE) \
|
|
||||||
$(INSTALLED_QEMU_VENDORIMAGE) \
|
|
||||||
$(QEMU_VERIFIED_BOOT_PARAMS) \
|
|
||||||
$(INSTALLED_USERDATAIMAGE_TARGET) \
|
|
||||||
$(INSTALLED_RAMDISK_TARGET) \
|
|
||||||
$(INSTALLED_SDK_BUILD_PROP_TARGET) \
|
|
||||||
$(INSTALLED_BUILD_PROP_TARGET) \
|
|
||||||
$(ATREE_FILES) \
|
$(ATREE_FILES) \
|
||||||
$(sdk_atree_files) \
|
$(sdk_atree_files) \
|
||||||
$(HOST_OUT_EXECUTABLES)/atree \
|
$(HOST_OUT_EXECUTABLES)/atree \
|
||||||
|
|
|
@ -1936,10 +1936,6 @@ ALL_SDK_TARGETS := $(INTERNAL_SDK_TARGET)
|
||||||
sdk: $(ALL_SDK_TARGETS)
|
sdk: $(ALL_SDK_TARGETS)
|
||||||
$(call dist-for-goals,sdk, \
|
$(call dist-for-goals,sdk, \
|
||||||
$(ALL_SDK_TARGETS) \
|
$(ALL_SDK_TARGETS) \
|
||||||
$(SYMBOLS_ZIP) \
|
|
||||||
$(SYMBOLS_MAPPING) \
|
|
||||||
$(COVERAGE_ZIP) \
|
|
||||||
$(APPCOMPAT_ZIP) \
|
|
||||||
$(INSTALLED_BUILD_PROP_TARGET) \
|
$(INSTALLED_BUILD_PROP_TARGET) \
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in a new issue