StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch from jack to javac for unbundled builds"

Browse Source 
am: 355de0a00d

Change-Id: Ib281dd853420430e4e06fb0144b727e9a029be86
This commit is contained in:
Colin Cross
2017-09-27 03:33:31 +00:00
committed by android-build-merger
parent 2c717745b2 355de0a00d
commit a938462068
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/combo/javac.mk
View File

@@ -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