commit 248ef6f9c414db26fd1bc7ec3d4ee4f3b87d54cf
author Yohann Roussel <yroussel@google.com> Mon Sep 08 14:53:12 2014 +0200
committer Yohann Roussel <yroussel@google.com> Thu Nov 13 12:05:23 2014 +0100
tree 9272c391866a1379eb0b1062df0f9ad4671bf267
parent 6dd6aac9ef75ed336711a5d69e90e3fccf98ff9a

Allow compilation with Jack.

Change-Id: I03ccd6cd92102f03d1316b6a1184c49029c91ea0

Android.mk

diff --git a/Android.mk b/Android.mk
index 3d8d384..7c83715 100644
--- a/Android.mk
+++ b/Android.mk
@@ -404,6 +404,7 @@
 LOCAL_MODULE := framework
 
 LOCAL_DX_FLAGS := --core-library --multi-dex
+LOCAL_JACK_FLAGS := --multi-dex native
 
 LOCAL_RMTYPEDEFS := true
 
@@ -418,6 +419,7 @@
 framework_res_R_stamp := \
 	$(call intermediates-dir-for,APPS,framework-res,,COMMON)/src/R.stamp
 $(full_classes_compiled_jar): $(framework_res_R_stamp)
+$(built_dex_intermediate): $(framework_res_R_stamp)
 
 $(framework_module): | $(dir $(framework_module))framework-res.apk