diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-01-09 15:33:06 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-01-09 15:33:23 -0800 |
| commit | b6dcef8777a6ea70ec351be9ab4f549a39e5c977 (patch) | |
| tree | 6e5dfc9edbdbdc40aaa4d58e16564c9546d0f385 /core/combo/javac.mk | |
| parent | aed499879210c7432c1c5b3869f383b27b17dafc (diff) | |
| download | build-b6dcef8777a6ea70ec351be9ab4f549a39e5c977.zip build-b6dcef8777a6ea70ec351be9ab4f549a39e5c977.tar.gz build-b6dcef8777a6ea70ec351be9ab4f549a39e5c977.tar.bz2 | |
Add support for ALTERNATE_JAVAC
Bug: 12476356
Change-Id: Idd013031dc32a560bca76cca295bedcad55982b4
Diffstat (limited to 'core/combo/javac.mk')
| -rw-r--r-- | core/combo/javac.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/core/combo/javac.mk b/core/combo/javac.mk index 2aea3e1..cc2c872 100644 --- a/core/combo/javac.mk +++ b/core/combo/javac.mk @@ -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. @@ -32,6 +39,6 @@ endif HOST_JAVAC ?= $(COMMON_JAVAC) TARGET_JAVAC ?= $(COMMON_JAVAC) - + #$(info HOST_JAVAC=$(HOST_JAVAC)) #$(info TARGET_JAVAC=$(TARGET_JAVAC)) |