am 98c72521: am ad8271a8: Merge "Add support for ALTERNATE_JAVAC" (1df8d179) · Commits · e / os / android_build

core/combo/javac.mk

+9 −2

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		# Inputs:
		# CUSTOM_JAVA_COMPILER -- "eclipse", "openjdk". or nothing for the system
		# default
		# ALTERNATE_JAVAC -- the alternate java compiler to use
		#
		# Outputs:
		# COMMON_JAVAC -- Java compiler command with common arguments
		@@ -14,13 +15,19 @@ else
		common_flags := -source 1.7 -target 1.7 -Xmaxerrs 9999999
		endif

		# Use the indexer wrapper to index the codebase instead of the javac compiler
		ifeq ($(ALTERNATE_JAVAC),)
		JAVACC := javac
		else
		JAVACC := $(ALTERNATE_JAVAC)
		endif

		# Whatever compiler is on this system.
		ifeq ($(BUILD_OS), windows)
		COMMON_JAVAC := development/host/windows/prebuilt/javawrap.exe -J-Xmx256m \
		$(common_flags)
		else
		COMMON_JAVAC := javac -J-Xmx512M $(common_flags)
		COMMON_JAVAC := $(JAVACC) -J-Xmx512M $(common_flags)
		endif

		# Eclipse.