From c43ab6edc21acea362a3c276fbca860676adc27a Mon Sep 17 00:00:00 2001 From: Nick Reuter Date: Thu, 8 May 2014 21:36:05 -0500 Subject: javac: rename common_flags to avoid conflictions * Currently the flag conflicts with one seen in hardware/qcom rename to avoid issues. Change-Id: I876fcd6a254f349dc5260509bcddb0367a7d49d8 Signed-off-by: Nick Reuter --- core/combo/javac.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core') 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. -- cgit v1.1