StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I3aa24904,I1f942dc0,If51d0f53,Ie27bdbd2

Browse Source 
* changes:
  Remove target-files-package from PARSE_TIME_MAKE_GOALS
  Make dist zip files depend on files instead of images
  Make dependencies of target-files.zip conditional
  Remove INSTALLED_VBMETAIMAGE_TARGET dependency from target-files.zip
This commit is contained in:
Colin Cross
2020-09-03 16:56:39 +00:00
committed by Gerrit Code Review
parent 89d7b8aef7 e0dbbd4e9e
commit b9d0a2d4d5
3 changed files with 109 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
core/Makefile
View File

@@ -4264,12 +4264,83 @@ endef
# full system image deps, we speed up builds that do not build the system # full system image deps, we speed up builds that do not build the system
# image. # image.
ifdef BUILDING_SYSTEM_IMAGE ifdef BUILDING_SYSTEM_IMAGE
$(BUILT_TARGET_FILES_PACKAGE): $(FULL_SYSTEMIMAGE_DEPS) $(BUILT_TARGET_FILES_PACKAGE): $(FULL_SYSTEMIMAGE_DEPS)
endif
ifdef BUILDING_USERDATA_IMAGE
$(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_USERDATAIMAGE_FILES)
endif
ifdef BUILDING_SYSTEM_OTHER_IMAGE
$(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_SYSTEMOTHERIMAGE_FILES)
endif
ifdef BUILDING_VENDOR_BOOT_IMAGE
$(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_VENDOR_RAMDISK_FILES)
endif
ifdef BUILDING_RECOVERY_IMAGE
# TODO(b/30414428): Can't depend on INTERNAL_RECOVERYIMAGE_FILES alone like other
# BUILD_TARGET_FILES_PACKAGE dependencies because currently there're cp/rsync/rm
# commands in build-recoveryimage-target, which would touch the files under
# TARGET_RECOVERY_OUT and race with packaging target-files.zip.
ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
$(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_BOOTIMAGE_TARGET)
else
$(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_RECOVERYIMAGE_TARGET)
endif
$(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_RECOVERYIMAGE_FILES)
endif
# Conditionally depend on the image files if the image is being built so the
# target-files.zip rule doesn't wait on the image creation rule, or the image
# if it is coming from a prebuilt.
ifdef BUILDING_VENDOR_IMAGE
$(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_VENDORIMAGE_FILES)
else ifdef BOARD_PREBUILT_VENDORIMAGE
$(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_VENDORIMAGE_TARGET)
endif
ifdef BUILDING_PRODUCT_IMAGE
$(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_PRODUCTIMAGE_FILES)
else ifdef BOARD_PREBUILT_PRODUCTIMAGE
$(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_PRODUCTIMAGE_TARGET)
endif
ifdef BUILDING_SYSTEM_EXT_IMAGE
$(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_SYSTEM_EXTIMAGE_FILES)
else ifdef BOARD_PREBUILT_SYSTEM_EXTIMAGE
$(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_SYSTEM_EXTIMAGE_TARGET)
endif
ifdef BUILDING_BOOT_IMAGE
$(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_RAMDISK_FILES)
else ifdef BOARD_PREBUILT_BOOTIMAGE
$(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_BOOTIMAGE_TARGET)
endif
ifdef BUILDING_ODM_IMAGE
$(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_ODMIMAGE_FILES)
else ifdef BOARD_PREBUILT_ODMIMAGE
$(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_ODMIMAGE_TARGET)
endif
ifdef BUILDING_VENDOR_DLKM_IMAGE
$(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_VENDOR_DLKMIMAGE_FILES)
else ifdef BOARD_PREBUILT_VENDOR_DLKIMMAGE
$(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_VENDOR_DLKMIMAGE_TARGET)
endif
ifdef BUILDING_ODM_DLKM_IMAGE
$(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_ODM_DLKMIMAGE_FILES)
else ifdef BOARD_ODM_VENDOR_DLKIMMAGE
$(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_ODM_DLKMIMAGE_TARGET)
endif endif
ifeq ($(BUILD_QEMU_IMAGES),true) ifeq ($(BUILD_QEMU_IMAGES),true)
MK_VBMETA_BOOT_KERNEL_CMDLINE_SH := device/generic/goldfish/tools/mk_vbmeta_boot_params.sh MK_VBMETA_BOOT_KERNEL_CMDLINE_SH := device/generic/goldfish/tools/mk_vbmeta_boot_params.sh
$(BUILT_TARGET_FILES_PACKAGE): $(MK_VBMETA_BOOT_KERNEL_CMDLINE_SH) $(BUILT_TARGET_FILES_PACKAGE): $(MK_VBMETA_BOOT_KERNEL_CMDLINE_SH)
endif endif
ifdef BOARD_PREBUILT_BOOTLOADER ifdef BOARD_PREBUILT_BOOTLOADER
@@ -4280,23 +4351,11 @@ endif
# Depending on the various images guarantees that the underlying # Depending on the various images guarantees that the underlying
# directories are up-to-date. # directories are up-to-date.
$(BUILT_TARGET_FILES_PACKAGE): \ $(BUILT_TARGET_FILES_PACKAGE): \
$(INSTALLED_RAMDISK_TARGET) \
$(INSTALLED_BOOTIMAGE_TARGET) \
$(INSTALLED_VENDOR_BOOTIMAGE_TARGET) \
$(INSTALLED_RADIOIMAGE_TARGET) \ $(INSTALLED_RADIOIMAGE_TARGET) \
$(INSTALLED_RECOVERYIMAGE_TARGET) \ $(INSTALLED_RECOVERYIMAGE_TARGET) \
$(INSTALLED_USERDATAIMAGE_TARGET) \
$(INSTALLED_CACHEIMAGE_TARGET) \ $(INSTALLED_CACHEIMAGE_TARGET) \
$(INSTALLED_VENDORIMAGE_TARGET) \
$(INSTALLED_PRODUCTIMAGE_TARGET) \
$(INSTALLED_SYSTEM_EXTIMAGE_TARGET) \
$(INSTALLED_VBMETAIMAGE_TARGET) \
$(INSTALLED_ODMIMAGE_TARGET) \
$(INSTALLED_VENDOR_DLKMIMAGE_TARGET) \
$(INSTALLED_ODM_DLKMIMAGE_TARGET) \
$(INSTALLED_DTBOIMAGE_TARGET) \ $(INSTALLED_DTBOIMAGE_TARGET) \
$(INSTALLED_CUSTOMIMAGES_TARGET) \ $(INSTALLED_CUSTOMIMAGES_TARGET) \
$(INTERNAL_SYSTEMOTHERIMAGE_FILES) \
$(INSTALLED_ANDROID_INFO_TXT_TARGET) \ $(INSTALLED_ANDROID_INFO_TXT_TARGET) \
$(INSTALLED_KERNEL_TARGET) \ $(INSTALLED_KERNEL_TARGET) \
$(INSTALLED_DTBIMAGE_TARGET) \ $(INSTALLED_DTBIMAGE_TARGET) \
@@ -4650,9 +4709,7 @@ endif
.PHONY: target-files-package .PHONY: target-files-package
target-files-package: $(BUILT_TARGET_FILES_PACKAGE) target-files-package: $(BUILT_TARGET_FILES_PACKAGE)
ifneq ($(filter $(MAKECMDGOALS),target-files-package),)
$(call dist-for-goals, target-files-package, $(BUILT_TARGET_FILES_PACKAGE)) $(call dist-for-goals, target-files-package, $(BUILT_TARGET_FILES_PACKAGE))
endif
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# NDK Sysroot Package # NDK Sysroot Package
@@ -4726,13 +4783,12 @@ endif # build_ota_package
APPCOMPAT_ZIP := $(PRODUCT_OUT)/appcompat.zip APPCOMPAT_ZIP := $(PRODUCT_OUT)/appcompat.zip
# For apps_only build we'll establish the dependency later in build/make/core/main.mk. # For apps_only build we'll establish the dependency later in build/make/core/main.mk.
ifeq (,$(TARGET_BUILD_UNBUNDLED)) ifeq (,$(TARGET_BUILD_UNBUNDLED))
$(APPCOMPAT_ZIP): $(INSTALLED_SYSTEMIMAGE_TARGET) \ $(APPCOMPAT_ZIP): $(FULL_SYSTEMIMAGE_DEPS) \
$(INSTALLED_RAMDISK_TARGET) \ $(INTERNAL_RAMDISK_FILES) \
$(INSTALLED_BOOTIMAGE_TARGET) \ $(INTERNAL_USERDATAIMAGE_FILES) \
$(INSTALLED_USERDATAIMAGE_TARGET) \ $(INTERNAL_VENDORIMAGE_FILES) \
$(INSTALLED_VENDORIMAGE_TARGET) \ $(INTERNAL_PRODUCTIMAGE_FILES) \
$(INSTALLED_PRODUCTIMAGE_TARGET) \ $(INTERNAL_SYSTEM_EXTIMAGE_FILES)
$(INSTALLED_SYSTEM_EXTIMAGE_TARGET)
endif endif
$(APPCOMPAT_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,appcompat)/filelist $(APPCOMPAT_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,appcompat)/filelist
$(APPCOMPAT_ZIP): $(SOONG_ZIP) $(APPCOMPAT_ZIP): $(SOONG_ZIP)
@@ -4755,16 +4811,15 @@ name := $(name)-symbols-$(FILE_NAME_TAG)
SYMBOLS_ZIP := $(PRODUCT_OUT)/$(name).zip SYMBOLS_ZIP := $(PRODUCT_OUT)/$(name).zip
# For apps_only build we'll establish the dependency later in build/make/core/main.mk. # For apps_only build we'll establish the dependency later in build/make/core/main.mk.
ifeq (,$(TARGET_BUILD_UNBUNDLED)) ifeq (,$(TARGET_BUILD_UNBUNDLED))
$(SYMBOLS_ZIP): $(INSTALLED_SYSTEMIMAGE_TARGET) \ $(SYMBOLS_ZIP): $(FULL_SYSTEMIMAGE_DEPS) \
$(INSTALLED_RAMDISK_TARGET) \ $(INTERNAL_RAMDISK_FILES) \
$(INSTALLED_BOOTIMAGE_TARGET) \ $(INTERNAL_USERDATAIMAGE_FILES) \
$(INSTALLED_USERDATAIMAGE_TARGET) \ $(INTERNAL_VENDORIMAGE_FILES) \
$(INSTALLED_VENDORIMAGE_TARGET) \ $(INTERNAL_PRODUCTIMAGE_FILES) \
$(INSTALLED_PRODUCTIMAGE_TARGET) \ $(INTERNAL_SYSTEM_EXTIMAGE_FILES) \
$(INSTALLED_SYSTEM_EXTIMAGE_TARGET) \ $(INTERNAL_ODMIMAGE_FILES) \
$(INSTALLED_ODMIMAGE_TARGET) \ $(INTERNAL_VENDOR_DLKMIMAGE_FILES) \
$(INSTALLED_VENDOR_DLKMIMAGE_TARGET) \ $(INTERNAL_ODM_DLKMIMAGE_FILES) \
$(INSTALLED_ODM_DLKMIMAGE_TARGET) \
$(updater_dep) $(updater_dep)
endif endif
$(SYMBOLS_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,symbols)/filelist $(SYMBOLS_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,symbols)/filelist
@@ -4783,16 +4838,15 @@ name := $(name)_debug
endif endif
COVERAGE_ZIP := $(PRODUCT_OUT)/$(name).zip COVERAGE_ZIP := $(PRODUCT_OUT)/$(name).zip
ifeq (,$(TARGET_BUILD_UNBUNDLED)) ifeq (,$(TARGET_BUILD_UNBUNDLED))
$(COVERAGE_ZIP): $(INSTALLED_SYSTEMIMAGE_TARGET) \ $(COVERAGE_ZIP): $(FULL_SYSTEMIMAGE_DEPS) \
$(INSTALLED_RAMDISK_TARGET) \ $(INTERNAL_RAMDISK_FILES) \
$(INSTALLED_BOOTIMAGE_TARGET) \ $(INTERNAL_USERDATAIMAGE_FILES) \
$(INSTALLED_USERDATAIMAGE_TARGET) \ $(INTERNAL_VENDORIMAGE_FILES) \
$(INSTALLED_VENDORIMAGE_TARGET) \ $(INTERNAL_PRODUCTIMAGE_FILES) \
$(INSTALLED_PRODUCTIMAGE_TARGET) \ $(INTERNAL_SYSTEM_EXTIMAGE_FILES) \
$(INSTALLED_SYSTEM_EXTIMAGE_TARGET) \ $(INTERNAL_ODMIMAGE_FILES) \
$(INSTALLED_ODMIMAGE_TARGET) \ $(INTERNAL_VENDOR_DLKMIMAGE_FILES) \
$(INSTALLED_VENDOR_DLKMIMAGE_TARGET) \ $(INTERNAL_ODM_DLKMIMAGE_FILES)
$(INSTALLED_ODM_DLKMIMAGE_TARGET)
endif endif
$(COVERAGE_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,coverage)/filelist $(COVERAGE_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,coverage)/filelist
$(COVERAGE_ZIP): $(SOONG_ZIP) $(COVERAGE_ZIP): $(SOONG_ZIP)
@@ -4826,7 +4880,7 @@ endif
name := $(name)-apps-$(FILE_NAME_TAG) name := $(name)-apps-$(FILE_NAME_TAG)
APPS_ZIP := $(PRODUCT_OUT)/$(name).zip APPS_ZIP := $(PRODUCT_OUT)/$(name).zip
$(APPS_ZIP): $(INSTALLED_SYSTEMIMAGE_TARGET) $(APPS_ZIP): $(FULL_SYSTEMIMAGE_DEPS)
@echo "Package apps: $@" @echo "Package apps: $@"
$(hide) rm -rf $@ $(hide) rm -rf $@
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
@@ -4861,16 +4915,15 @@ PROGUARD_DICT_ZIP := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-dict-$(FILE_NAME_
# For apps_only build we'll establish the dependency later in build/make/core/main.mk. # For apps_only build we'll establish the dependency later in build/make/core/main.mk.
ifeq (,$(TARGET_BUILD_UNBUNDLED)) ifeq (,$(TARGET_BUILD_UNBUNDLED))
$(PROGUARD_DICT_ZIP): \ $(PROGUARD_DICT_ZIP): \
$(INSTALLED_SYSTEMIMAGE_TARGET) \ $(FULL_SYSTEMIMAGE_DEPS) \
$(INSTALLED_RAMDISK_TARGET) \ $(INTERNAL_RAMDISK_FILES) \
$(INSTALLED_BOOTIMAGE_TARGET) \ $(INTERNAL_USERDATAIMAGE_FILES) \
$(INSTALLED_USERDATAIMAGE_TARGET) \ $(INTERNAL_VENDORIMAGE_FILES) \
$(INSTALLED_VENDORIMAGE_TARGET) \ $(INTERNAL_PRODUCTIMAGE_FILES) \
$(INSTALLED_PRODUCTIMAGE_TARGET) \ $(INTERNAL_SYSTEM_EXTIMAGE_FILES) \
$(INSTALLED_SYSTEM_EXTIMAGE_TARGET) \ $(INTERNAL_ODMIMAGE_FILES) \
$(INSTALLED_ODMIMAGE_TARGET) \ $(INTERNAL_VENDOR_DLKMIMAGE_FILES) \
$(INSTALLED_VENDOR_DLKMIMAGE_TARGET) \ $(INTERNAL_ODM_DLKMIMAGE_FILES) \
$(INSTALLED_ODM_DLKMIMAGE_TARGET) \
$(updater_dep) $(updater_dep)
endif endif
$(PROGUARD_DICT_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,proguard)/filelist $(PROGUARD_DICT_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,proguard)/filelist

2
core/main.mk
View File

@@ -419,7 +419,7 @@ ifdef is_sdk_build
sdk_repo_goal := $(strip $(filter sdk_repo,$(MAKECMDGOALS))) sdk_repo_goal := $(strip $(filter sdk_repo,$(MAKECMDGOALS)))
MAKECMDGOALS := $(strip $(filter-out sdk_repo,$(MAKECMDGOALS))) MAKECMDGOALS := $(strip $(filter-out sdk_repo,$(MAKECMDGOALS)))
ifneq ($(words $(sort $(filter-out $(INTERNAL_MODIFIER_TARGETS) checkbuild emulator_tests target-files-package,$(MAKECMDGOALS)))),1) ifneq ($(words $(sort $(filter-out $(INTERNAL_MODIFIER_TARGETS) checkbuild emulator_tests,$(MAKECMDGOALS)))),1)
$(error The 'sdk' target may not be specified with any other targets) $(error The 'sdk' target may not be specified with any other targets)
endif endif

1
core/ninja_config.mk
View File

@@ -35,7 +35,6 @@ PARSE_TIME_MAKE_GOALS := \
sdk_addon \ sdk_addon \
sdk_repo \ sdk_repo \
stnod \ stnod \
target-files-package \
test-art% \ test-art% \
user \ user \
userdataimage \ userdataimage \