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

Commit 395358ed authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Trim down dont_bother_goals 

This had caused the nodeps targets to break when I added the
auto-cleanup feature, as we wrote out smaller lists of what was
installed. The functionality of dont_bother_goals is also being fixed in
https://android-review.googlesource.com/c/platform/build/+/1250929/

But there's also no reason to have all of these targets in
dont_bother_goals, as they can just re-use the cached kati build graph.

Bug: 149460609
Test: m systemimage && m snod    <did not delete everything>
Test: m snod    <still see warning>
Test: codesearch for uses of MAKECMDGOALS and these targets
Change-Id: Ib8e7ba67e5ad980be4bdcf521c5156eea7941f97
parent 791a8b51

core/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -2730,12 +2730,9 @@ systemimage-nodeps snod: $(filter-out systemimage-nodeps snod,$(MAKECMDGOALS)) \ 
	@echo "make $@: ignoring dependencies"

	$(call build-systemimage-target,$(INSTALLED_SYSTEMIMAGE_TARGET))

	$(hide) $(call assert-max-image-size,$(INSTALLED_SYSTEMIMAGE_TARGET),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))



ifneq (,$(filter systemimage-nodeps snod, $(MAKECMDGOALS)))

ifeq (true,$(WITH_DEXPREOPT))

	$(warning Warning: with dexpreopt enabled, you may need a full rebuild.)

endif

endif



endif # BUILDING_SYSTEM_IMAGE

core/config.mk

+0 −17
Original line number Diff line number Diff line
@@ -1219,23 +1219,6 @@ endif 
# These goals don't need to collect and include Android.mks/CleanSpec.mks

# in the source tree.

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



ifeq ($(CALLED_FROM_SETUP),true)

core/ninja_config.mk

+0 −2
Original line number Diff line number Diff line
@@ -40,9 +40,7 @@ PARSE_TIME_MAKE_GOALS := \ 
	sdk \

	sdk_addon \

	sdk_repo \

	snod \

	stnod \

	systemimage-nodeps \

	target-files-package \

	test-art% \

	user \