LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
am: d29421db99

Change-Id: I324b5572e68b64378ae70076258f677a64a1d0ab
This commit is contained in:
Yohann Roussel
2016-12-05 15:43:21 +00:00
committed by android-build-merger
parent c114d50846 d29421db99
commit 32e1696537
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/Android.mk
View File

@@ -89,6 +89,8 @@ ALL_SDK_FILES += $(android_jar_src_target)
# ==================================================== # ====================================================
# multidex jack library
ALL_SDK_FILES += $(call intermediates-dir-for, JAVA_LIBRARIES,android-support-multidex,,COMMON)/classes.jack
# The Jack & Jill compiler jars # The Jack & Jill compiler jars
ALL_SDK_FILES += prebuilts/sdk/tools/jacks/jack-$(JACK_SDKTOOL_VERSION).jar ALL_SDK_FILES += prebuilts/sdk/tools/jacks/jack-$(JACK_SDKTOOL_VERSION).jar
ALL_SDK_FILES += prebuilts/sdk/tools/jills/jill-$(JACK_SDKTOOL_VERSION).jar ALL_SDK_FILES += prebuilts/sdk/tools/jills/jill-$(JACK_SDKTOOL_VERSION).jar

2
build/sdk.atree
View File

@@ -489,6 +489,7 @@ frameworks/multidex/library/project.properties
frameworks/multidex/library/src/.readme extras/android/support/multidex/library/src/.readme frameworks/multidex/library/src/.readme extras/android/support/multidex/library/src/.readme
frameworks/multidex/library/res/.readme extras/android/support/multidex/library/res/.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/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/README.txt extras/android/support/multidex/instrumentation/README.txt
frameworks/multidex/instrumentation/.project extras/android/support/multidex/instrumentation/.project frameworks/multidex/instrumentation/.project extras/android/support/multidex/instrumentation/.project
@@ -499,6 +500,7 @@ frameworks/multidex/instrumentation/src/.readme
frameworks/multidex/instrumentation/res/.readme extras/android/support/multidex/instrumentation/res/.readme 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-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/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/README.txt extras/android/support/v7/mediarouter/README.txt
frameworks/support/v7/mediarouter/.project extras/android/support/v7/mediarouter/.project frameworks/support/v7/mediarouter/.project extras/android/support/v7/mediarouter/.project