Merge "javac: rename common_flags to avoid conflictions" (3afc688a) · Commits · e / os / android_build

core/combo/javac.mk

+4 −4

Original line number	Diff line number	Diff line
		@@ -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.