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

am 2d2ce1b6: Merge "Add res folder to multidex SDK projects."

Browse Source 
* commit '2d2ce1b6c3d8dc221ac783103b116ce8dcdfd7e2':
  Add res folder to multidex SDK projects.
This commit is contained in:
Yohann Roussel
2014-07-18 10:55:27 +00:00
committed by Android Git Automerger
parent 8a8f24886d 2d2ce1b6c3
commit a7aa5e0e86
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/sdk.atree
View File

@@ -371,6 +371,7 @@ frameworks/support/multidex/library/.classpath
frameworks/support/multidex/library/AndroidManifest.xml extras/android/support/multidex/library/AndroidManifest.xml frameworks/support/multidex/library/AndroidManifest.xml extras/android/support/multidex/library/AndroidManifest.xml
frameworks/support/multidex/library/project.properties extras/android/support/multidex/library/project.properties frameworks/support/multidex/library/project.properties extras/android/support/multidex/library/project.properties
frameworks/support/multidex/library/src/.readme extras/android/support/multidex/library/src/.readme frameworks/support/multidex/library/src/.readme extras/android/support/multidex/library/src/.readme
frameworks/support/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
frameworks/support/multidex/instrumentation/README.txt extras/android/support/multidex/instrumentation/README.txt frameworks/support/multidex/instrumentation/README.txt extras/android/support/multidex/instrumentation/README.txt
@@ -379,6 +380,7 @@ frameworks/support/multidex/instrumentation/.classpath
frameworks/support/multidex/instrumentation/AndroidManifest.xml extras/android/support/multidex/instrumentation/AndroidManifest.xml frameworks/support/multidex/instrumentation/AndroidManifest.xml extras/android/support/multidex/instrumentation/AndroidManifest.xml
frameworks/support/multidex/instrumentation/project.properties extras/android/support/multidex/instrumentation/project.properties frameworks/support/multidex/instrumentation/project.properties extras/android/support/multidex/instrumentation/project.properties
frameworks/support/multidex/instrumentation/src/.readme extras/android/support/multidex/instrumentation/src/.readme frameworks/support/multidex/instrumentation/src/.readme extras/android/support/multidex/instrumentation/src/.readme
frameworks/support/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