From 6fee567b2fea8f4728a9c4ec172ebaf60ceef2cf Mon Sep 17 00:00:00 2001 From: Maurice Chu Date: Wed, 16 Oct 2013 14:24:45 -0700 Subject: [PATCH] Move multidex support library Multidex is being moved from frameworks/support/multidex to frameworks/multidex. Bug: 10674263 (cherry picked from commit 7b433ee4e4d8a515d2a99f36c6e1fbb655fc9063) Change-Id: If33387af7b58da2f258eba1240a911483daa9c7e --- build/sdk.atree | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/build/sdk.atree b/build/sdk.atree index 8e957fcbd..7d4b20521 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -365,22 +365,22 @@ frameworks/support/v7/appcompat/src/.readme ${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-appcompat_intermediates/android-support-v7-appcompat.jar extras/android/support/v7/appcompat/libs/android-support-v7-appcompat.jar ${OUT_DIR}/target/common/obj/PACKAGING/android-support-v4_intermediates/android-support-v4.jar extras/android/support/v7/appcompat/libs/android-support-v4.jar -frameworks/support/multidex/library/README.txt extras/android/support/multidex/library/README.txt -frameworks/support/multidex/library/.project extras/android/support/multidex/library/.project -frameworks/support/multidex/library/.classpath extras/android/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 +frameworks/multidex/library/README.txt extras/android/support/multidex/library/README.txt +frameworks/multidex/library/.project extras/android/support/multidex/library/.project +frameworks/multidex/library/.classpath extras/android/support/multidex/library/.classpath +frameworks/multidex/library/AndroidManifest.xml extras/android/support/multidex/library/AndroidManifest.xml +frameworks/multidex/library/project.properties extras/android/support/multidex/library/project.properties +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 -frameworks/support/multidex/instrumentation/README.txt extras/android/support/multidex/instrumentation/README.txt -frameworks/support/multidex/instrumentation/.project extras/android/support/multidex/instrumentation/.project -frameworks/support/multidex/instrumentation/.classpath extras/android/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 +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/.classpath extras/android/support/multidex/instrumentation/.classpath +frameworks/multidex/instrumentation/AndroidManifest.xml extras/android/support/multidex/instrumentation/AndroidManifest.xml +frameworks/multidex/instrumentation/project.properties extras/android/support/multidex/instrumentation/project.properties +frameworks/multidex/instrumentation/src/.readme extras/android/support/multidex/instrumentation/src/.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_intermediates/android-support-multidex.jar extras/android/support/multidex/instrumentation/libs/android-support-multidex.jar