Merge "Disable jack completely"
This commit is contained in:
@@ -8,14 +8,7 @@
|
|||||||
# ANDROID_JAVA_TOOLCHAIN -- Directory that contains javac and other java tools
|
# ANDROID_JAVA_TOOLCHAIN -- Directory that contains javac and other java tools
|
||||||
#
|
#
|
||||||
|
|
||||||
ifndef ANDROID_COMPILE_WITH_JACK
|
ANDROID_COMPILE_WITH_JACK := false
|
||||||
# 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
|
|
||||||
|
|
||||||
ifdef TARGET_BUILD_APPS
|
ifdef TARGET_BUILD_APPS
|
||||||
ifndef TURBINE_ENABLED
|
ifndef TURBINE_ENABLED
|
||||||
|
Reference in New Issue
Block a user