diff options
| author | Ying Wang <wangying@android.com> | 2014-05-09 16:45:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 16:45:44 +0000 |
| commit | 9889229133470c89acfb0083f8d5c62c29ea1d4e (patch) | |
| tree | 3d9aecfc40c86f8033f434771fc06ad578c31e51 /core | |
| parent | 05a7a955c12318a8f44c1fea467afde96a45342b (diff) | |
| parent | 3afc688a6acc1753a2b104719a7a27f223f50750 (diff) | |
| download | build-9889229133470c89acfb0083f8d5c62c29ea1d4e.zip build-9889229133470c89acfb0083f8d5c62c29ea1d4e.tar.gz build-9889229133470c89acfb0083f8d5c62c29ea1d4e.tar.bz2 | |
am 3afc688a: Merge "javac: rename common_flags to avoid conflictions"
* commit '3afc688a6acc1753a2b104719a7a27f223f50750':
javac: rename common_flags to avoid conflictions
Diffstat (limited to 'core')
| -rw-r--r-- | core/combo/javac.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/combo/javac.mk b/core/combo/javac.mk index 153ab5f..4248af0 100644 --- a/core/combo/javac.mk +++ b/core/combo/javac.mk @@ -10,9 +10,9 @@ # ifneq ($(LEGACY_USE_JAVA6),) -common_flags := -target 1.5 -Xmaxerrs 9999999 +common_jdk_flags := -target 1.5 -Xmaxerrs 9999999 else -common_flags := -source 1.7 -target 1.7 -Xmaxerrs 9999999 +common_jdk_flags := -source 1.7 -target 1.7 -Xmaxerrs 9999999 endif # Use the indexer wrapper to index the codebase instead of the javac compiler @@ -25,9 +25,9 @@ endif # Whatever compiler is on this system. ifeq ($(BUILD_OS), windows) COMMON_JAVAC := development/host/windows/prebuilt/javawrap.exe -J-Xmx256m \ - $(common_flags) + $(common_jdk_flags) else - COMMON_JAVAC := $(JAVACC) -J-Xmx1024M $(common_flags) + COMMON_JAVAC := $(JAVACC) -J-Xmx1024M $(common_jdk_flags) endif # Eclipse. |