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

am 96e487b2: am 98892291: am 3afc688a: Merge "javac: rename common_flags to avoid conflictions" 

* commit '96e487b262c2d5d7c02d49e29e71895588e15549':
  javac: rename common_flags to avoid conflictions
This commit is contained in:
Ying Wang 2014-05-09 16:54:38 +00:00 committed by Android Git Automerger
parent 0cd5ec5b16 96e487b262
commit 38e49504ef
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/combo/javac.mk
View File

@ -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.