Merge "Disable jack completely" (480ee2e5) · Commits · e / os / android_build

core/combo/javac.mk

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -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
	# 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		ANDROID_COMPILE_WITH_JACK := false
	endif
	endif

	ifdef TARGET_BUILD_APPS		ifdef TARGET_BUILD_APPS
	ifndef TURBINE_ENABLED		ifndef TURBINE_ENABLED