summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurimas Liutikas <aurimas@google.com>2017-05-01 14:53:18 -0700
committerAurimas Liutikas <aurimas@google.com>2017-05-01 14:53:18 -0700
commiteadfa6df97992f26ffb5de91865f87a4b62dc84a (patch)
tree189f201d298ddafecac4c8291cd9efb7d97f5885
parente26850bab3f81957eee3a82643f8b6a0ffe81b90 (diff)
downloadmultidex-eadfa6df97992f26ffb5de91865f87a4b62dc84a.tar.gz
Fix multidex artifactId.
In ag/1971845 we accidentally changed artifactId of multidex and multidex-instrumentation to support-multidex and support-multidex-instrumentation. This change undoes that change. Bug: 36122649 Test: ./gradle clean dist now produces correct repo zip Change-Id: I110446366250315be0d04929b333d47c3fba0d2c
-rw-r--r--instrumentation/build.gradle2
-rw-r--r--settings.gradle8
2 files changed, 5 insertions, 5 deletions
diff --git a/instrumentation/build.gradle b/instrumentation/build.gradle
index adea6d7..1e6fd98 100644
--- a/instrumentation/build.gradle
+++ b/instrumentation/build.gradle
@@ -17,7 +17,7 @@
apply plugin: 'com.android.library'
dependencies {
- compile project(':support-multidex')
+ compile project(':multidex')
}
android {
diff --git a/settings.gradle b/settings.gradle
index 516f997..7fffc9b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-include ':support-multidex'
-project(':support-multidex').projectDir = new File(rootDir, 'library')
+include ':multidex'
+project(':multidex').projectDir = new File(rootDir, 'library')
-include ':support-multidex-instrumentation'
-project(':support-multidex-instrumentation').projectDir = new File(rootDir, 'instrumentation')
+include ':multidex-instrumentation'
+project(':multidex-instrumentation').projectDir = new File(rootDir, 'instrumentation')