diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-12-04 09:26:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-04 09:26:54 +0000 |
| commit | e1c00320b674f2416029694f3486e79fb28afdd0 (patch) | |
| tree | 30396f2384790c9b4a29fd7867b8e74417d57f25 /Android.mk | |
| parent | 48d196b9c50afe9aff50f4f8ec6acc6a066bbfdb (diff) | |
| parent | 248ef6f9c414db26fd1bc7ec3d4ee4f3b87d54cf (diff) | |
| download | frameworks_base-e1c00320b674f2416029694f3486e79fb28afdd0.zip frameworks_base-e1c00320b674f2416029694f3486e79fb28afdd0.tar.gz frameworks_base-e1c00320b674f2416029694f3486e79fb28afdd0.tar.bz2 | |
Merge "Allow compilation with Jack."
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -409,6 +409,7 @@ LOCAL_JAVA_LIBRARIES := core-libart conscrypt okhttp core-junit bouncycastle ext LOCAL_MODULE := framework LOCAL_DX_FLAGS := --core-library --multi-dex +LOCAL_JACK_FLAGS := --multi-dex native LOCAL_RMTYPEDEFS := true @@ -420,6 +421,7 @@ framework_module := $(LOCAL_INSTALLED_MODULE) 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 |