Merge "Disable jack completely"

am: 480ee2e58c

Change-Id: I72f0d856228dc5b68e5f581802d5a64f9c814255
This commit is contained in:
Colin Cross 2017-09-28 00:40:05 +00:00 committed by android-build-merger
commit 56294539dc

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