Merge "Add res folder to multidex SDK projects."
This commit is contained in:
@@ -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/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/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
|
||||
|
||||
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/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/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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user