Merge "Switch from jack to javac for unbundled builds"
This commit is contained in:
@@ -13,12 +13,7 @@ ifndef ANDROID_COMPILE_WITH_JACK
|
|||||||
ifdef PRODUCT_COMPILE_WITH_JACK
|
ifdef PRODUCT_COMPILE_WITH_JACK
|
||||||
ANDROID_COMPILE_WITH_JACK := $(PRODUCT_COMPILE_WITH_JACK)
|
ANDROID_COMPILE_WITH_JACK := $(PRODUCT_COMPILE_WITH_JACK)
|
||||||
else
|
else
|
||||||
# TODO(b/62038127): remove TARGET_BUILD_APPS check
|
ANDROID_COMPILE_WITH_JACK := false
|
||||||
ifdef TARGET_BUILD_APPS
|
|
||||||
ANDROID_COMPILE_WITH_JACK := true
|
|
||||||
else
|
|
||||||
ANDROID_COMPILE_WITH_JACK := false
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user