diff options
| author | Colin Cross <ccross@android.com> | 2020-08-27 14:14:26 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2020-09-02 23:16:28 +0000 |
| commit | e0dbbd4e9e98f9b58cec285739ac63afbfac7c9d (patch) | |
| tree | 1ca75c9345176ac1b465dd92b9ca7075a292b552 | |
| parent | cda30c73c9b9b4dc0a8ea1bab178998484df4f0f (diff) | |
| download | build-e0dbbd4e9e98f9b58cec285739ac63afbfac7c9d.tar.gz | |
Remove target-files-package from PARSE_TIME_MAKE_GOALS
It isn't doing anything useful that would be necessary to reparse the
Makefiles for.
Test: m target-files-package
Change-Id: I3aa2490480de8dbe0e57fe36221088c3f18017cb
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | core/main.mk | 2 | ||||
| -rw-r--r-- | core/ninja_config.mk | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/core/Makefile b/core/Makefile index 490c00314a..1f9bd14d67 100644 --- a/core/Makefile +++ b/core/Makefile @@ -4709,9 +4709,7 @@ endif .PHONY: 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)) -endif # ----------------------------------------------------------------- # NDK Sysroot Package diff --git a/core/main.mk b/core/main.mk index ebee25a044..36071b8d2b 100644 --- a/core/main.mk +++ b/core/main.mk @@ -419,7 +419,7 @@ ifdef is_sdk_build sdk_repo_goal := $(strip $(filter 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) endif diff --git a/core/ninja_config.mk b/core/ninja_config.mk index 4d1009fda8..6fccacda29 100644 --- a/core/ninja_config.mk +++ b/core/ninja_config.mk @@ -35,7 +35,6 @@ PARSE_TIME_MAKE_GOALS := \ sdk_addon \ sdk_repo \ stnod \ - target-files-package \ test-art% \ user \ userdataimage \ |