Merge "Disable jack completely"

This commit is contained in:
Treehugger Robot 2017-09-28 00:34:50 +00:00 committed by Gerrit Code Review
commit 480ee2e58c

View file

@ -8,14 +8,7 @@
# ANDROID_JAVA_TOOLCHAIN -- Directory that contains javac and other java tools
#
ifndef ANDROID_COMPILE_WITH_JACK
# TODO(b/64113890, b/35788202): remove PRODUCT_COMPILE_WITH_JACK
ifdef PRODUCT_COMPILE_WITH_JACK
ANDROID_COMPILE_WITH_JACK := $(PRODUCT_COMPILE_WITH_JACK)
else
ANDROID_COMPILE_WITH_JACK := false
endif
endif
ANDROID_COMPILE_WITH_JACK := false
ifdef TARGET_BUILD_APPS
ifndef TURBINE_ENABLED