Clean up multidex gradle build, bump version to 1.0.2 for release

Bug: 36122649
Test: ./gradlew dist test connectedAndroidTest
Change-Id: I79578f683146a3ea16521cd090d113698a14c5f5

1 files changed, 21 insertions, 2 deletions

diff --git a/settings.gradle b/settings.gradle
index c1c64f3..516f997 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,21 @@
-include ':library'
-include ':instrumentation'
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+include ':support-multidex'
+project(':support-multidex').projectDir = new File(rootDir, 'library')
+
+include ':support-multidex-instrumentation'
+project(':support-multidex-instrumentation').projectDir = new File(rootDir, 'instrumentation')