This reverts commit 6c77a6baa6
.
Reason for revert: aog/974065 fixes the problem that caused the revert
Change-Id: I935f78762b23ac63a79a9529515ff4ef394d5c3c
21 lines
502 B
Makefile
21 lines
502 B
Makefile
# Selects a Java compiler.
|
|
#
|
|
# Outputs:
|
|
# ANDROID_JAVA_TOOLCHAIN -- Directory that contains javac and other java tools
|
|
#
|
|
|
|
ANDROID_COMPILE_WITH_JACK := false
|
|
|
|
ifdef TARGET_BUILD_APPS
|
|
ifndef TURBINE_ENABLED
|
|
TURBINE_ENABLED := false
|
|
endif
|
|
endif
|
|
|
|
ANDROID_JAVA_TOOLCHAIN := $(ANDROID_JAVA_HOME)/bin
|
|
|
|
# TODO(ccross): remove this, it is needed for now because it is used by
|
|
# config.mk before makevars from soong are loaded
|
|
JAVA := $(ANDROID_JAVA_TOOLCHAIN)/java -XX:OnError="cat hs_err_pid%p.log"
|
|
|