p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Trim down dont_bother_goals"

This commit is contained in:
Treehugger Robot 2020-03-05 19:07:15 +00:00 committed by Gerrit Code Review
parent 573f458718 395358edae
commit 90d4027542
3 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/Makefile
View File

@ -2730,11 +2730,8 @@ systemimage-nodeps snod: $(filter-out systemimage-nodeps snod,$(MAKECMDGOALS)) \
@echo "make $@: ignoring dependencies" @echo "make $@: ignoring dependencies"
$(call build-systemimage-target,$(INSTALLED_SYSTEMIMAGE_TARGET)) $(call build-systemimage-target,$(INSTALLED_SYSTEMIMAGE_TARGET))
$(hide) $(call assert-max-image-size,$(INSTALLED_SYSTEMIMAGE_TARGET),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE)) $(hide) $(call assert-max-image-size,$(INSTALLED_SYSTEMIMAGE_TARGET),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))
ifneq (,$(filter systemimage-nodeps snod, $(MAKECMDGOALS)))
ifeq (true,$(WITH_DEXPREOPT)) ifeq (true,$(WITH_DEXPREOPT))
$(warning Warning: with dexpreopt enabled, you may need a full rebuild.) $(warning Warning: with dexpreopt enabled, you may need a full rebuild.)
endif
endif endif
endif # BUILDING_SYSTEM_IMAGE endif # BUILDING_SYSTEM_IMAGE

17
core/config.mk
View File

@ -1219,23 +1219,6 @@ endif
# These goals don't need to collect and include Android.mks/CleanSpec.mks # These goals don't need to collect and include Android.mks/CleanSpec.mks
# in the source tree. # in the source tree.
dont_bother_goals := out \ dont_bother_goals := out \
snod systemimage-nodeps \
userdataimage-nodeps \
cacheimage-nodeps \
bptimage-nodeps \
vnod vendorimage-nodeps \
pnod productimage-nodeps \
senod systemextimage-nodeps \
onod odmimage-nodeps \
systemotherimage-nodeps \
ramdisk-nodeps \
ramdisk_debug-nodeps \
ramdisk_test_harness-nodeps \
bootimage-nodeps \
bootimage_debug-nodeps \
bootimage_test_harness-nodeps \
recoveryimage-nodeps \
vbmetaimage-nodeps \
product-graph dump-products product-graph dump-products
ifeq ($(CALLED_FROM_SETUP),true) ifeq ($(CALLED_FROM_SETUP),true)

2
core/ninja_config.mk
View File

@ -40,9 +40,7 @@ PARSE_TIME_MAKE_GOALS := \
sdk \ sdk \
sdk_addon \ sdk_addon \
sdk_repo \ sdk_repo \
snod \
stnod \ stnod \
systemimage-nodeps \
target-files-package \ target-files-package \
test-art% \ test-art% \
user \ user \