openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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
parent cb5f9a282e ad8271a8e6
commit 98c7252113
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/combo/javac.mk
View File

@ -3,6 +3,7 @@
# Inputs: # Inputs:
# CUSTOM_JAVA_COMPILER -- "eclipse", "openjdk". or nothing for the system # CUSTOM_JAVA_COMPILER -- "eclipse", "openjdk". or nothing for the system
# default # default
# ALTERNATE_JAVAC -- the alternate java compiler to use
# #
# Outputs: # Outputs:
# COMMON_JAVAC -- Java compiler command with common arguments # COMMON_JAVAC -- Java compiler command with common arguments
@ -14,13 +15,19 @@ else
common_flags := -source 1.7 -target 1.7 -Xmaxerrs 9999999 common_flags := -source 1.7 -target 1.7 -Xmaxerrs 9999999
endif 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. # Whatever compiler is on this system.
ifeq ($(BUILD_OS), windows) ifeq ($(BUILD_OS), windows)
COMMON_JAVAC := development/host/windows/prebuilt/javawrap.exe -J-Xmx256m \ COMMON_JAVAC := development/host/windows/prebuilt/javawrap.exe -J-Xmx256m \
$(common_flags) $(common_flags)
else else
COMMON_JAVAC := javac -J-Xmx512M $(common_flags) COMMON_JAVAC := $(JAVACC) -J-Xmx512M $(common_flags)
endif endif
# Eclipse. # Eclipse.
@ -32,6 +39,6 @@ endif
HOST_JAVAC ?= $(COMMON_JAVAC) HOST_JAVAC ?= $(COMMON_JAVAC)
TARGET_JAVAC ?= $(COMMON_JAVAC) TARGET_JAVAC ?= $(COMMON_JAVAC)
#$(info HOST_JAVAC=$(HOST_JAVAC)) #$(info HOST_JAVAC=$(HOST_JAVAC))
#$(info TARGET_JAVAC=$(TARGET_JAVAC)) #$(info TARGET_JAVAC=$(TARGET_JAVAC))