Skip to content

Commit 19b848f

Browse files
author
Yohann Roussel
committed
Deliver android-support-multidex.jack in SDK
Bug: https://code.google.com/p/android/issues/detail?id=224026 Test: make PRODUCT-sdk-win_sdk sdk_repo Change-Id: Iecc0f7bc5c3518d9ac81111a52f8a7b3ecbcc717
1 parent 06c7276 commit 19b848f

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

build/Android.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ ALL_SDK_FILES += $(android_jar_src_target)
8989

9090
# ====================================================
9191

92+
# multidex jack library
93+
ALL_SDK_FILES += $(call intermediates-dir-for, JAVA_LIBRARIES,android-support-multidex,,COMMON)/classes.jack
9294
# The Jack & Jill compiler jars
9395
ALL_SDK_FILES += prebuilts/sdk/tools/jacks/jack-$(JACK_SDKTOOL_VERSION).jar
9496
ALL_SDK_FILES += prebuilts/sdk/tools/jills/jill-$(JACK_SDKTOOL_VERSION).jar

build/sdk.atree

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,7 @@ frameworks/multidex/library/project.properties
481481
frameworks/multidex/library/src/.readme extras/android/support/multidex/library/src/.readme
482482
frameworks/multidex/library/res/.readme extras/android/support/multidex/library/res/.readme
483483
${OUT_DIR}/target/common/obj/PACKAGING/android-support-multidex_intermediates/android-support-multidex.jar extras/android/support/multidex/library/libs/android-support-multidex.jar
484+
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android-support-multidex_intermediates/classes.jack extras/android/support/multidex/library/libs/android-support-multidex.jack
484485

485486
frameworks/multidex/instrumentation/README.txt extras/android/support/multidex/instrumentation/README.txt
486487
frameworks/multidex/instrumentation/.project extras/android/support/multidex/instrumentation/.project
@@ -491,6 +492,7 @@ frameworks/multidex/instrumentation/src/.readme
491492
frameworks/multidex/instrumentation/res/.readme extras/android/support/multidex/instrumentation/res/.readme
492493
${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
493494
${OUT_DIR}/target/common/obj/PACKAGING/android-support-multidex_intermediates/android-support-multidex.jar extras/android/support/multidex/instrumentation/libs/android-support-multidex.jar
495+
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android-support-multidex_intermediates/classes.jack extras/android/support/multidex/instrumentation/libs/android-support-multidex.jack
494496

495497
frameworks/support/v7/mediarouter/README.txt extras/android/support/v7/mediarouter/README.txt
496498
frameworks/support/v7/mediarouter/.project extras/android/support/v7/mediarouter/.project

0 commit comments

Comments
 (0)