commit be2d3307e23f08bbc29e1b33b6aba9c7d05a5867
author Colin Cross <ccross@android.com> Wed Dec 21 16:48:32 2016 -0800
committer Colin Cross <ccross@android.com> Thu Feb 16 11:41:42 2017 -0800
tree 8ce1604900d34f98860b49d0e9723bb541ebc647
parent 97ebc29e9c3afb65394be27c09ab42ca7d32c602

Revert "Remove support of disabling Jack."

This reverts commit ba068f48727dee2223b3be3b0359accb949e363d.

Test: builds
Change-Id: I2c4d64e26c2e4ceb710a39de2ee9749160d33a72

Android.mk

diff --git a/Android.mk b/Android.mk
index a798a31..bf3d226 100644
--- a/Android.mk
+++ b/Android.mk
@@ -513,6 +513,7 @@
 
 LOCAL_MODULE := framework
 
+LOCAL_DX_FLAGS := --core-library --multi-dex
 LOCAL_JACK_FLAGS := --multi-dex native
 
 LOCAL_RMTYPEDEFS := true
@@ -1348,6 +1349,8 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := ext
 
+LOCAL_DX_FLAGS := --core-library
+
 ifneq ($(INCREMENTAL_BUILDS),)
     LOCAL_PROGUARD_ENABLED := disabled
     LOCAL_JACK_ENABLED := incremental