p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Switch from jack to javac for unbundled builds" am: 355de0a00d am: a938462068 

am: 4e38043602

Change-Id: Ica3728b0d3c7571ac22e1a6faa62fefb5c9fc514
This commit is contained in:
Colin Cross 2017-09-27 03:42:00 +00:00 committed by android-build-merger
parent ec346cf1fd 4e38043602
commit 69a2a38222
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/combo/javac.mk
View File

@ -12,15 +12,10 @@ ifndef ANDROID_COMPILE_WITH_JACK
# TODO(b/64113890, b/35788202): remove PRODUCT_COMPILE_WITH_JACK # TODO(b/64113890, b/35788202): remove PRODUCT_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
# TODO(b/62038127): remove TARGET_BUILD_APPS check
ifdef TARGET_BUILD_APPS
ANDROID_COMPILE_WITH_JACK := true
else else
ANDROID_COMPILE_WITH_JACK := false ANDROID_COMPILE_WITH_JACK := false
endif endif
endif endif
endif
ifdef TARGET_BUILD_APPS ifdef TARGET_BUILD_APPS
ifndef TURBINE_ENABLED ifndef TURBINE_ENABLED