All introduce a flag LEGACY_USE_JAVA6 to force java6 builds. This is an unsupported configuration, and provided temporarily to iron out regressions and compare build output (if required.). - Increment the version check sequence number. - Move a more specific check (OpenJDK vs non OpenJDK) after the more general version check. - Update the link in the version check error message to the "initializing" page instead of the "download" page. The latter talks about repo, mainly. bug: 8992787 Change-Id: I313e17b1911768d4f3bc318c4162c53dec6eaf0d Conflicts: core/main.mk
45 lines
1.1 KiB
Makefile
45 lines
1.1 KiB
Makefile
# Selects a Java compiler.
|
|
#
|
|
# 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
|
|
#
|
|
|
|
ifneq ($(LEGACY_USE_JAVA6),)
|
|
common_flags := -target 1.5 -Xmaxerrs 9999999
|
|
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 := $(JAVACC) -J-Xmx768M $(common_flags)
|
|
endif
|
|
|
|
# Eclipse.
|
|
ifeq ($(CUSTOM_JAVA_COMPILER), eclipse)
|
|
COMMON_JAVAC := java -Xmx256m -jar prebuilt/common/ecj/ecj.jar -5 \
|
|
-maxProblems 9999999 -nowarn
|
|
$(info CUSTOM_JAVA_COMPILER=eclipse)
|
|
endif
|
|
|
|
HOST_JAVAC ?= $(COMMON_JAVAC)
|
|
TARGET_JAVAC ?= $(COMMON_JAVAC)
|
|
|
|
#$(info HOST_JAVAC=$(HOST_JAVAC))
|
|
#$(info TARGET_JAVAC=$(TARGET_JAVAC))
|