am ad8271a8: Merge "Add support for ALTERNATE_JAVAC"

* commit 'ad8271a8e6a1f050c1852d6dc3df0eb6777e5606':
  Add support for ALTERNATE_JAVAC
This commit is contained in:
Brian Carlstrom 2014-01-09 18:36:22 -08:00 committed by Android Git Automerger
commit 98c7252113

View file

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