commit 79e2f73b6c47e89b60cae6b4b2b2bd2ab0a4992a
author Colin Cross <ccross@android.com> Wed Dec 21 14:29:13 2016 -0800
committer Colin Cross <ccross@android.com> Thu Feb 16 14:08:45 2017 -0800
tree 18ca9e5a57d81df116a9967de70d8d7ef0f7d26d
parent 5f50896a7f5fb1e7f33185f0008ca2b899c8b124

Re-enable dx support

This is a partial revert of commits:
858657366fa6 Remove support of disabling Jack.
3ae78612522e Remove javac support in host dex rules.
22313f2b2a4a Remove rules for building dex with dx

Test: builds
Change-Id: Ie12d743cbe978bdeb030910848b67f5945a4fec8

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 2f43f46..f40f697 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -605,6 +605,11 @@
 FAT16COPY := build/tools/fat16copy.py
 CHECK_LINK_TYPE := build/tools/check_link_type.py
 
+ifeq ($(ANDROID_COMPILE_WITH_JACK),true)
+DEFAULT_JACK_ENABLED:=full
+else
+DEFAULT_JACK_ENABLED:=
+endif
 ifneq ($(ANDROID_JACK_EXTRA_ARGS),)
 JACK_DEFAULT_ARGS :=
 DEFAULT_JACK_EXTRA_ARGS := $(ANDROID_JACK_EXTRA_ARGS)