commit d29421db99468d990eeb5775b0ab995705586ebe
author Yohann Roussel <yroussel@google.com> Mon Dec 05 15:36:50 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Dec 05 15:36:50 2016 +0000
tree 58b46e63e468ecdfacc0bf27fe1e69061373b3cf
parent 3475b7f16d3abed56a24eedf88b768ae73e5ab4c
parent da07dcd7f91fefc3a7533864366218a0b30139c4

Merge "Deliver android-support-multidex.jack in SDK"
am: da07dcd7f9

Change-Id: I7e9e51ade83f3cc2b7d141a45ec1a43fac804b4e

build/Android.mk

diff --git a/build/Android.mk b/build/Android.mk
index 319d225..c647ecd 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -89,6 +89,8 @@
 
 # ====================================================
 
+# multidex jack library
+ALL_SDK_FILES += $(call intermediates-dir-for, JAVA_LIBRARIES,android-support-multidex,,COMMON)/classes.jack
 # The Jack & Jill compiler jars
 ALL_SDK_FILES += prebuilts/sdk/tools/jacks/jack-$(JACK_SDKTOOL_VERSION).jar
 ALL_SDK_FILES += prebuilts/sdk/tools/jills/jill-$(JACK_SDKTOOL_VERSION).jar

build/sdk.atree

diff --git a/build/sdk.atree b/build/sdk.atree
index f0b8c35..1c43c08 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -486,6 +486,7 @@
 frameworks/multidex/library/src/.readme                                                           extras/android/support/multidex/library/src/.readme
 frameworks/multidex/library/res/.readme                                                           extras/android/support/multidex/library/res/.readme
 ${OUT_DIR}/target/common/obj/PACKAGING/android-support-multidex_intermediates/android-support-multidex.jar              extras/android/support/multidex/library/libs/android-support-multidex.jar
+${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android-support-multidex_intermediates/classes.jack                         extras/android/support/multidex/library/libs/android-support-multidex.jack
 
 frameworks/multidex/instrumentation/README.txt                                                         extras/android/support/multidex/instrumentation/README.txt
 frameworks/multidex/instrumentation/.project                                                           extras/android/support/multidex/instrumentation/.project
@@ -496,6 +497,7 @@
 frameworks/multidex/instrumentation/res/.readme                                                        extras/android/support/multidex/instrumentation/res/.readme
 ${OUT_DIR}/target/common/obj/PACKAGING/android-support-multidex-instrumentation_intermediates/android-support-multidex-instrumentation.jar      extras/android/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
 ${OUT_DIR}/target/common/obj/PACKAGING/android-support-multidex_intermediates/android-support-multidex.jar                                      extras/android/support/multidex/instrumentation/libs/android-support-multidex.jar
+${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android-support-multidex_intermediates/classes.jack                                                 extras/android/support/multidex/instrumentation/libs/android-support-multidex.jack
 
 frameworks/support/v7/mediarouter/README.txt                                                       extras/android/support/v7/mediarouter/README.txt
 frameworks/support/v7/mediarouter/.project                                                         extras/android/support/v7/mediarouter/.project