diff options
author | Ying Wang <wangying@google.com> | 2015-05-07 16:53:13 -0700 |
---|---|---|
committer | Ying Wang <wangying@google.com> | 2015-05-07 16:53:13 -0700 |
commit | f28bad5227dd566395e458b5266e716d7fa5f958 (patch) | |
tree | 1b6d891eb4d7099ff1ec0aa4ed8d48c987d72db1 /core/main.mk | |
parent | 455ffaafcd5b6d0296bfa6143baccb01c84e2382 (diff) | |
download | build-f28bad5227dd566395e458b5266e716d7fa5f958.zip build-f28bad5227dd566395e458b5266e716d7fa5f958.tar.gz build-f28bad5227dd566395e458b5266e716d7fa5f958.tar.bz2 |
Fix and cleanup.
- Detect java-source-list before transforming to java-source-list-uniq.
This fixes non-fatal errors in build log like:
/bin/bash:
out/target/common/obj/APPS/android.core.tests.libcore.package.tzdata_intermediates/classes/java-source-list:
No such file or directory
- Cleaned the outdated incrementaljavac. Nobody is using this feature
and now we switched to jack.
Change-Id: If1adb9b5820d9b295a11984c0f170f9a7ff4de7b
Diffstat (limited to 'core/main.mk')
-rw-r--r-- | core/main.mk | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/core/main.mk b/core/main.mk index 3bf9cae..e04c4c7 100644 --- a/core/main.mk +++ b/core/main.mk @@ -234,23 +234,7 @@ endif # These are the modifier targets that don't do anything themselves, but # change the behavior of the build. # (must be defined before including definitions.make) -INTERNAL_MODIFIER_TARGETS := showcommands all incrementaljavac - -.PHONY: incrementaljavac -incrementaljavac: ; - -# WARNING: -# ENABLE_INCREMENTALJAVAC should NOT be enabled by default, because change of -# a Java source file won't trigger rebuild of its dependent Java files. -# You can only enable it by adding "incrementaljavac" to your make command line. -# You are responsible for the correctness of the incremental build. -# This may decrease incremental build time dramatically for large Java libraries, -# such as core.jar, framework.jar, etc. -ENABLE_INCREMENTALJAVAC := -ifneq (,$(filter incrementaljavac, $(MAKECMDGOALS))) -ENABLE_INCREMENTALJAVAC := true -MAKECMDGOALS := $(filter-out incrementaljavac, $(MAKECMDGOALS)) -endif +INTERNAL_MODIFIER_TARGETS := showcommands all # EMMA_INSTRUMENT_STATIC merges the static emma library to each emma-enabled module. ifeq (true,$(EMMA_INSTRUMENT_STATIC)) |