Add test that builds all the test projects.

Change-Id: I8686052470b71f9f61f83da360a205a2f04d5271

255 files changed, 208 insertions, 551 deletions

diff --git a/.gitignore b/.gitignore
index 4c28e93..8968a13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,12 +7,12 @@ local.properties
 /build
 gradle/build
 tests/*/build
-samples/*/build
-samples/multiproject/*/build
-samples/tictactoe/*/build
-samples/applibtest/*/build
-samples/flavorlib/*/build
-samples/libsTest/*/build
-samples/repo/*/build
+tests/*/build
+tests/multiproject/*/build
+tests/tictactoe/*/build
+tests/applibtest/*/build
+tests/flavorlib/*/build
+tests/libsTest/*/build
+tests/repo/*/build
 /repo
 /out
diff --git a/builder/prebuilts/sdklib.jar b/builder/prebuilts/sdklib.jar
index 6dc2a17..af69e01 100644
--- a/builder/prebuilts/sdklib.jar
+++ b/builder/prebuilts/sdklib.jar
diff --git a/gradle/src/main/groovy/com/android/build/gradle/AppPlugin.groovy b/gradle/src/main/groovy/com/android/build/gradle/AppPlugin.groovy
index dc5c249..d777023 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/AppPlugin.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/AppPlugin.groovy
@@ -71,7 +71,6 @@ class AppPlugin extends com.android.build.gradle.BasePlugin implements org.gradl
         extension = project.extensions.create('android', AppExtension,
                 this, (ProjectInternal) project, instantiator,
                 buildTypeContainer, productFlavorContainer)
-        extension.
         setDefaultConfig(extension.defaultConfig, extension.sourceSetsContainer)
 
         buildTypeContainer.whenObjectAdded { BuildType buildType ->
diff --git a/gradle/src/test/groovy/com/android/build/gradle/ProjectTest.groovy b/gradle/src/test/groovy/com/android/build/gradle/ProjectTest.groovy
new file mode 100644
index 0000000..045d50e
--- /dev/null
+++ b/gradle/src/test/groovy/com/android/build/gradle/ProjectTest.groovy
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+package com.android.build.gradle
+
+import com.android.build.gradle.internal.BaseTest
+import com.android.sdklib.internal.project.ProjectProperties
+import com.android.sdklib.internal.project.ProjectPropertiesWorkingCopy
+import com.google.common.collect.Sets
+import org.gradle.tooling.GradleConnector
+import org.gradle.tooling.ProjectConnection
+
+/**
+ */
+class ProjectTest extends BaseTest {
+
+    private File testDir
+    private File sdkDir
+    private static Set<String> builtProjects = Sets.newHashSet()
+
+    @Override
+    protected void setUp() throws Exception {
+        testDir = getTestDir()
+        sdkDir = getSdkDir()
+    }
+
+    void testAidl() {
+        buildProject("aidl")
+    }
+
+    void testApi() {
+        buildProject("api")
+    }
+
+    void testAppLibTest() {
+        buildProject("applibtest")
+    }
+
+    void testBasic() {
+        buildProject("basic")
+    }
+
+    void testDependencies() {
+        buildProject("dependencies")
+    }
+
+    void testFlavored() {
+        buildProject("flavored")
+    }
+
+    void testFlavorLib() {
+        buildProject("flavorlib")
+    }
+
+    void testFlavors() {
+        buildProject("flavors")
+    }
+
+    void testlibsTest() {
+        buildProject("libsTest")
+    }
+
+    void testMigrated() {
+        buildProject("migrated")
+    }
+
+    void testMultiProject() {
+        buildProject("multiproject")
+    }
+
+    void testRepo() {
+        // this is not an actual project, but we add it so that the catch-all below doesn't
+        // try to build it again
+        builtProjects.add("repo")
+
+        File repo = new File(testDir, "repo")
+
+        try {
+            buildProject(new File(repo, "util"), "clean", "uploadArchives")
+            buildProject(new File(repo, "baseLibrary"), "clean", "uploadArchives")
+            buildProject(new File(repo, "library"), "clean", "uploadArchives")
+            buildProject(new File(repo, "app"), "clean", "assemble")
+        } finally {
+            // clean up the test repository.
+            File testrepo = new File(repo, "testrepo")
+            testrepo.deleteDir()
+        }
+    }
+
+    void testTicTacToe() {
+        buildProject("tictactoe")
+    }
+
+    void testOtherProjects() {
+        File[] projects = testDir.listFiles()
+        for (File project : projects) {
+            String name = project.name
+            if (!builtProjects.contains(name)) {
+                System.out.println(">>>> " + name)
+                buildProject(name)
+            }
+        }
+    }
+
+    private void buildProject(String name) {
+        File project = new File(testDir, name)
+        builtProjects.add(name)
+        System.out.println("### " + name)
+
+        buildProject(project, "clean", "assemble")
+    }
+
+    private void buildProject(File project, String... tasks) {
+        File localProp = createLocalProp(project)
+
+        try {
+
+            GradleConnector connector = GradleConnector.newConnector()
+
+            ProjectConnection connection = connector
+                    .useGradleVersion("1.2")
+                    .forProjectDirectory(project)
+                    .connect()
+//                    .useInstallation(new File("/Users/xav/Desktop/gradle-1.2"))
+
+            connection.newBuild().forTasks(tasks).run()
+        } finally {
+            localProp.delete()
+        }
+    }
+
+
+    private File createLocalProp(File project) {
+        ProjectPropertiesWorkingCopy localProp = ProjectProperties.create(
+                project.absolutePath, ProjectProperties.PropertyType.LOCAL)
+        localProp.setProperty(ProjectProperties.PROPERTY_SDK, sdkDir.absolutePath)
+        localProp.save()
+
+        return (File) localProp.file
+    }
+}
diff --git a/gradle/src/test/groovy/com/android/build/gradle/internal/BaseTest.groovy b/gradle/src/test/groovy/com/android/build/gradle/internal/BaseTest.groovy
index 2a97455..c83fc08 100644
--- a/gradle/src/test/groovy/com/android/build/gradle/internal/BaseTest.groovy
+++ b/gradle/src/test/groovy/com/android/build/gradle/internal/BaseTest.groovy
@@ -24,22 +24,19 @@ import java.security.CodeSource
  * Base class for tests.
  */
 public abstract class BaseTest extends TestCase {
+
     /**
-     * Returns the Android source tree root dir.
-     * @return the root dir or null if it couldn't be computed.
+     * Returns the gradle plugin test folder.
      */
-    protected File getTestDir() {
+    protected File getRootDir() {
         CodeSource source = getClass().getProtectionDomain().getCodeSource()
         if (source != null) {
             URL location = source.getLocation();
             try {
                 File dir = new File(location.toURI())
                 assertTrue(dir.getPath(), dir.exists())
-                System.out.println(dir.absolutePath)
-
-                File rootDir = dir.getParentFile().getParentFile().getParentFile().getParentFile()
 
-                return new File(rootDir, "tests")
+                return dir.getParentFile().getParentFile().getParentFile().getParentFile()
             } catch (URISyntaxException e) {
                 fail(e.getLocalizedMessage())
             }
@@ -47,4 +44,40 @@ public abstract class BaseTest extends TestCase {
 
         fail("Fail to get tests folder")
     }
+
+
+    /**
+     * Returns the root folder for the tests projects.
+     */
+    protected File getTestDir() {
+        File rootDir = getRootDir()
+        return new File(rootDir, "tests")
+    }
+
+    /**
+     * Returns the SDK folder as built from the Android source tree.
+     * @return
+     */
+    protected File getSdkDir() {
+        // get the gradle project root dir.
+        File rootDir = getRootDir()
+
+        // go up twice and get the root Android dir.
+        File androidRootDir = rootDir.getParentFile().getParentFile()
+
+        // get the sdk folder
+        File sdk = new File(androidRootDir, "out" + File.separatorChar + "host" + File.separatorChar + "darwin-x86" + File.separatorChar + "sdk")
+
+        File[] files = sdk.listFiles(new FilenameFilter() {
+
+            @Override
+            boolean accept(File file, String s) {
+                return s.startsWith("android-sdk_") && new File(file,s ).isDirectory()
+            }
+        })
+
+        if (files.length == 1) {
+            return files[0]
+        }
+    }
 }
diff --git a/samples/basic/build.gradle b/samples/basic/build.gradle
deleted file mode 100644
index 3822a01..0000000
--- a/samples/basic/build.gradle
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// A basic Android application that follows all the conventions
-//
-buildscript {
-    repositories {
-        maven { url '../../repo' }
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.3-SNAPSHOT'
-    }
-}
-apply plugin: 'android'
-
-android {
-    target "android-15"
-    testBuildType "debug"
-
-    defaultConfig {
-        versionCode 12
-        versionName "2.0"
-        minSdkVersion 16
-        targetSdkVersion 16
-
-        signingStoreLocation "debug.keystore"
-        signingStorePassword "android"
-        signingKeyAlias "androiddebugkey"
-        signingKeyPassword "android"
- 
-        buildConfig "private final static boolean DEFAULT = true;", \
-                    "private final static String FOO = \"foo\";"
-    }
-
-    buildTypes {
-        debug {
-            packageNameSuffix ".debug"
-
-            buildConfig "private final static boolean DEBUG2 = false;"
-        }
-    }
-
-    aaptOptions {
-        noCompress 'txt'
-    }
-}
\ No newline at end of file
diff --git a/samples/basic/src/release/res/values/strings.xml b/samples/basic/src/release/res/values/strings.xml
deleted file mode 100644
index 532909c..0000000
--- a/samples/basic/src/release/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">_Test-Basic-Release</string>
-</resources>
diff --git a/samples/flavored/debug.keystore b/samples/flavored/debug.keystore
deleted file mode 100644
index 389278e..0000000
--- a/samples/flavored/debug.keystore
+++ /dev/null
diff --git a/samples/migrated/AndroidManifest.xml b/samples/migrated/AndroidManifest.xml
deleted file mode 100644
index 4f8d570..0000000
--- a/samples/migrated/AndroidManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.android.tests.basic">
-    <application android:label="@string/app_name" android:icon="@drawable/icon">
-        <activity android:name=".Main"
-                  android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-    <uses-permission android:name="com.blah" />
-
-    <permission-group android:name="foo.permission-group.COST_MONEY"
-        android:label="@string/app_name"
-        android:description="@string/app_name" />
-
-    <permission android:name="foo.permission.SEND_SMS"
-        android:permissionGroup="foo.permission-group.COST_MONEY"
-        android:label="@string/app_name"
-        android:description="@string/app_name" />
-
-    <permission android:name="foo.blah.SEND_SMS"
-        android:permissionGroup="foo.permission-group.COST_MONEY"
-        android:label="@string/app_name"
-        android:description="@string/app_name" />
-
-</manifest>
diff --git a/samples/migrated/assets/notice.txt b/samples/migrated/assets/notice.txt
deleted file mode 100644
index 33ff961..0000000
--- a/samples/migrated/assets/notice.txt
+++ /dev/null
@@ -1,190 +0,0 @@
-
-   Copyright (c) 2005-2012, 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.
-
-   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.
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
diff --git a/samples/migrated/res/drawable/icon.png b/samples/migrated/res/drawable/icon.png
deleted file mode 100644
index a07c69f..0000000
--- a/samples/migrated/res/drawable/icon.png
+++ /dev/null
diff --git a/samples/migrated/res/layout/main.xml b/samples/migrated/res/layout/main.xml
deleted file mode 100644
index b199751..0000000
--- a/samples/migrated/res/layout/main.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-<TextView
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:text="Test App - Basic"
-    android:id="@+id/text"
-    />
-</LinearLayout>
-
diff --git a/samples/migrated/res/raw/notice.txt b/samples/migrated/res/raw/notice.txt
deleted file mode 100644
index 33ff961..0000000
--- a/samples/migrated/res/raw/notice.txt
+++ /dev/null
@@ -1,190 +0,0 @@
-
-   Copyright (c) 2005-2012, 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.
-
-   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.
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
diff --git a/samples/migrated/res/values/strings.xml b/samples/migrated/res/values/strings.xml
deleted file mode 100644
index 60ea2d0..0000000
--- a/samples/migrated/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">_Test-Basic</string>
-</resources>
diff --git a/samples/migrated/src/com/android/tests/basic/Main.java b/samples/migrated/src/com/android/tests/basic/Main.java
deleted file mode 100644
index 2b0e698..0000000
--- a/samples/migrated/src/com/android/tests/basic/Main.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.android.tests.basic;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class Main extends Activity
-{
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-    }
-}
diff --git a/samples/migrated/tests/src/com/android/tests/basic/MainTest.java b/samples/migrated/tests/src/com/android/tests/basic/MainTest.java
deleted file mode 100644
index 7cf7329..0000000
--- a/samples/migrated/tests/src/com/android/tests/basic/MainTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.android.tests.basic;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.TextView;
-
-public class MainTest extends ActivityInstrumentationTestCase2<Main> {
-
-    private TextView mTextView;
-
-    /**
-     * Creates an {@link ActivityInstrumentationTestCase2} that tests the {@link Main} activity.
-     */
-    public MainTest() {
-        super(Main.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        final Main a = getActivity();
-        // ensure a valid handle to the activity has been returned
-        assertNotNull(a);
-        mTextView = (TextView) a.findViewById(R.id.text);
-    }
-
-    /**
-     * The name 'test preconditions' is a convention to signal that if this
-     * test doesn't pass, the test case was not set up properly and it might
-     * explain any and all failures in other tests.  This is not guaranteed
-     * to run before other tests, as junit uses reflection to find the tests.
-     */
-    @MediumTest
-    public void testPreconditions() {
-        assertNotNull(mTextView);
-    }
-}
-
diff --git a/samples/aidl/build.gradle b/tests/aidl/build.gradle
index dc42ba2..dc42ba2 100644
--- a/samples/aidl/build.gradle
+++ b/tests/aidl/build.gradle
diff --git a/samples/aidl/src/main/AndroidManifest.xml b/tests/aidl/src/main/AndroidManifest.xml
index 1d6740d..1d6740d 100644
--- a/samples/aidl/src/main/AndroidManifest.xml
+++ b/tests/aidl/src/main/AndroidManifest.xml
diff --git a/samples/aidl/src/main/aidl/com/android/tests/basicprojectwithaidl/ITest.aidl b/tests/aidl/src/main/aidl/com/android/tests/basicprojectwithaidl/ITest.aidl
index 9b81031..9b81031 100644
--- a/samples/aidl/src/main/aidl/com/android/tests/basicprojectwithaidl/ITest.aidl
+++ b/tests/aidl/src/main/aidl/com/android/tests/basicprojectwithaidl/ITest.aidl
diff --git a/samples/aidl/src/main/aidl/com/android/tests/basicprojectwithaidl/Rect.aidl b/tests/aidl/src/main/aidl/com/android/tests/basicprojectwithaidl/Rect.aidl
index 734cf77..734cf77 100644
--- a/samples/aidl/src/main/aidl/com/android/tests/basicprojectwithaidl/Rect.aidl
+++ b/tests/aidl/src/main/aidl/com/android/tests/basicprojectwithaidl/Rect.aidl
diff --git a/samples/aidl/src/main/java/com/android/tests/basicprojectwithaidl/Main.java b/tests/aidl/src/main/java/com/android/tests/basicprojectwithaidl/Main.java
index eaed510..eaed510 100644
--- a/samples/aidl/src/main/java/com/android/tests/basicprojectwithaidl/Main.java
+++ b/tests/aidl/src/main/java/com/android/tests/basicprojectwithaidl/Main.java
diff --git a/samples/aidl/src/main/java/com/android/tests/basicprojectwithaidl/Rect.java b/tests/aidl/src/main/java/com/android/tests/basicprojectwithaidl/Rect.java
index 8e16926..8e16926 100644
--- a/samples/aidl/src/main/java/com/android/tests/basicprojectwithaidl/Rect.java
+++ b/tests/aidl/src/main/java/com/android/tests/basicprojectwithaidl/Rect.java
diff --git a/samples/aidl/src/main/res/drawable/icon.png b/tests/aidl/src/main/res/drawable/icon.png
index a07c69f..a07c69f 100644
--- a/samples/aidl/src/main/res/drawable/icon.png
+++ b/tests/aidl/src/main/res/drawable/icon.png
diff --git a/samples/aidl/src/main/res/layout/main.xml b/tests/aidl/src/main/res/layout/main.xml
index 783e4a0..783e4a0 100644
--- a/samples/aidl/src/main/res/layout/main.xml
+++ b/tests/aidl/src/main/res/layout/main.xml
diff --git a/samples/aidl/src/main/res/values/strings.xml b/tests/aidl/src/main/res/values/strings.xml
index a7322d3..a7322d3 100644
--- a/samples/aidl/src/main/res/values/strings.xml
+++ b/tests/aidl/src/main/res/values/strings.xml
diff --git a/samples/api/build.gradle b/tests/api/build.gradle
index cc72e03..be69012 100644
--- a/samples/api/build.gradle
+++ b/tests/api/build.gradle
@@ -18,15 +18,15 @@ android.buildVariants.each { variant ->
     // does some processing (or not)
     // and outputs a jar
     def jarTask = tasks.add(name: "jar${variant.name.capitalize()}", type: Jar) {
-        from           variant.compileTask.destinationDir
+        from           variant.javaCompile.destinationDir
         destinationDir file("${buildDir}/jars/${variant.dirName}")
         baseName       "classes"
     }
 
     // this task depends on the compilation task
-    jarTask.dependsOn variant.compileTask
+    jarTask.dependsOn variant.javaCompile
 
     // now make the dex task depend on it and use its output
-    variant.dexTask.dependsOn jarTask
-    variant.dexTask.sourceFiles = files(jarTask.archivePath).files
+    variant.dex.dependsOn jarTask
+    variant.dex.sourceFiles = files(jarTask.archivePath).files
 }
\ No newline at end of file
diff --git a/samples/api/src/main/AndroidManifest.xml b/tests/api/src/main/AndroidManifest.xml
index 4f8d570..4f8d570 100644
--- a/samples/api/src/main/AndroidManifest.xml
+++ b/tests/api/src/main/AndroidManifest.xml
diff --git a/samples/api/src/main/java/com/android/tests/basic/Main.java b/tests/api/src/main/java/com/android/tests/basic/Main.java
index 2b0e698..2b0e698 100644
--- a/samples/api/src/main/java/com/android/tests/basic/Main.java
+++ b/tests/api/src/main/java/com/android/tests/basic/Main.java
diff --git a/samples/api/src/main/res/drawable/icon.png b/tests/api/src/main/res/drawable/icon.png
index a07c69f..a07c69f 100644
--- a/samples/api/src/main/res/drawable/icon.png
+++ b/tests/api/src/main/res/drawable/icon.png
diff --git a/samples/api/src/main/res/layout/main.xml b/tests/api/src/main/res/layout/main.xml
index b199751..b199751 100644
--- a/samples/api/src/main/res/layout/main.xml
+++ b/tests/api/src/main/res/layout/main.xml
diff --git a/samples/api/src/main/res/values/strings.xml b/tests/api/src/main/res/values/strings.xml
index 60ea2d0..60ea2d0 100644
--- a/samples/api/src/main/res/values/strings.xml
+++ b/tests/api/src/main/res/values/strings.xml
diff --git a/samples/api/src/release/res/values/strings.xml b/tests/api/src/release/res/values/strings.xml
index 532909c..532909c 100644
--- a/samples/api/src/release/res/values/strings.xml
+++ b/tests/api/src/release/res/values/strings.xml
diff --git a/samples/api/src/test/java/com/android/tests/basic/MainTest.java b/tests/api/src/test/java/com/android/tests/basic/MainTest.java
index 7cf7329..7cf7329 100644
--- a/samples/api/src/test/java/com/android/tests/basic/MainTest.java
+++ b/tests/api/src/test/java/com/android/tests/basic/MainTest.java
diff --git a/samples/applibtest/app/build.gradle b/tests/applibtest/app/build.gradle
index abc0dbd..abc0dbd 100644
--- a/samples/applibtest/app/build.gradle
+++ b/tests/applibtest/app/build.gradle
diff --git a/samples/applibtest/app/proguard-project.txt b/tests/applibtest/app/proguard-project.txt
index f2fe155..f2fe155 100644
--- a/samples/applibtest/app/proguard-project.txt
+++ b/tests/applibtest/app/proguard-project.txt
diff --git a/samples/applibtest/app/src/main/AndroidManifest.xml b/tests/applibtest/app/src/main/AndroidManifest.xml
index 41e6b82..41e6b82 100644
--- a/samples/applibtest/app/src/main/AndroidManifest.xml
+++ b/tests/applibtest/app/src/main/AndroidManifest.xml
diff --git a/samples/applibtest/app/src/main/res/drawable-hdpi/ic_launcher.png b/tests/applibtest/app/src/main/res/drawable-hdpi/ic_launcher.png
index 96a442e..96a442e 100644
--- a/samples/applibtest/app/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/tests/applibtest/app/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/samples/applibtest/app/src/main/res/drawable-ldpi/ic_launcher.png b/tests/applibtest/app/src/main/res/drawable-ldpi/ic_launcher.png
index 9923872..9923872 100644
--- a/samples/applibtest/app/src/main/res/drawable-ldpi/ic_launcher.png
+++ b/tests/applibtest/app/src/main/res/drawable-ldpi/ic_launcher.png
diff --git a/samples/applibtest/app/src/main/res/drawable-mdpi/ic_launcher.png b/tests/applibtest/app/src/main/res/drawable-mdpi/ic_launcher.png
index 359047d..359047d 100644
--- a/samples/applibtest/app/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/tests/applibtest/app/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/samples/applibtest/app/src/main/res/drawable-xhdpi/ic_launcher.png b/tests/applibtest/app/src/main/res/drawable-xhdpi/ic_launcher.png
index 71c6d76..71c6d76 100644
--- a/samples/applibtest/app/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/tests/applibtest/app/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/samples/applibtest/app/src/main/res/values/strings.xml b/tests/applibtest/app/src/main/res/values/strings.xml
index c933032..c933032 100644
--- a/samples/applibtest/app/src/main/res/values/strings.xml
+++ b/tests/applibtest/app/src/main/res/values/strings.xml
diff --git a/samples/applibtest/app/src/test/AndroidManifest.xml b/tests/applibtest/app/src/test/AndroidManifest.xml
index 5252972..5252972 100644
--- a/samples/applibtest/app/src/test/AndroidManifest.xml
+++ b/tests/applibtest/app/src/test/AndroidManifest.xml
diff --git a/samples/applibtest/app/src/test/java/com/android/tests/testprojecttest/lib/LibActivityTest.java b/tests/applibtest/app/src/test/java/com/android/tests/testprojecttest/lib/LibActivityTest.java
index 9be6f97..9be6f97 100644
--- a/samples/applibtest/app/src/test/java/com/android/tests/testprojecttest/lib/LibActivityTest.java
+++ b/tests/applibtest/app/src/test/java/com/android/tests/testprojecttest/lib/LibActivityTest.java
diff --git a/samples/applibtest/app/src/test/java/com/android/tests/testprojecttest/test/AllTests.java b/tests/applibtest/app/src/test/java/com/android/tests/testprojecttest/test/AllTests.java
index a77b53c..a77b53c 100644
--- a/samples/applibtest/app/src/test/java/com/android/tests/testprojecttest/test/AllTests.java
+++ b/tests/applibtest/app/src/test/java/com/android/tests/testprojecttest/test/AllTests.java
diff --git a/samples/applibtest/build.gradle b/tests/applibtest/build.gradle
index a0832c6..a0832c6 100644
--- a/samples/applibtest/build.gradle
+++ b/tests/applibtest/build.gradle
diff --git a/samples/applibtest/lib/build.gradle b/tests/applibtest/lib/build.gradle
index 5ca87af..5ca87af 100644
--- a/samples/applibtest/lib/build.gradle
+++ b/tests/applibtest/lib/build.gradle
diff --git a/samples/applibtest/lib/proguard-project.txt b/tests/applibtest/lib/proguard-project.txt
index f2fe155..f2fe155 100644
--- a/samples/applibtest/lib/proguard-project.txt
+++ b/tests/applibtest/lib/proguard-project.txt
diff --git a/samples/applibtest/lib/src/main/AndroidManifest.xml b/tests/applibtest/lib/src/main/AndroidManifest.xml
index 26598f0..26598f0 100644
--- a/samples/applibtest/lib/src/main/AndroidManifest.xml
+++ b/tests/applibtest/lib/src/main/AndroidManifest.xml
diff --git a/samples/applibtest/lib/src/main/aidl/com/android/tests/basicprojectwithaidl/ITest.aidl b/tests/applibtest/lib/src/main/aidl/com/android/tests/basicprojectwithaidl/ITest.aidl
index 9b81031..9b81031 100644
--- a/samples/applibtest/lib/src/main/aidl/com/android/tests/basicprojectwithaidl/ITest.aidl
+++ b/tests/applibtest/lib/src/main/aidl/com/android/tests/basicprojectwithaidl/ITest.aidl
diff --git a/samples/applibtest/lib/src/main/aidl/com/android/tests/basicprojectwithaidl/Rect.aidl b/tests/applibtest/lib/src/main/aidl/com/android/tests/basicprojectwithaidl/Rect.aidl
index 734cf77..734cf77 100644
--- a/samples/applibtest/lib/src/main/aidl/com/android/tests/basicprojectwithaidl/Rect.aidl
+++ b/tests/applibtest/lib/src/main/aidl/com/android/tests/basicprojectwithaidl/Rect.aidl
diff --git a/samples/applibtest/lib/src/main/java/com/android/tests/testprojecttest/lib/LibActivity.java b/tests/applibtest/lib/src/main/java/com/android/tests/testprojecttest/lib/LibActivity.java
index 7d7f607..7d7f607 100644
--- a/samples/applibtest/lib/src/main/java/com/android/tests/testprojecttest/lib/LibActivity.java
+++ b/tests/applibtest/lib/src/main/java/com/android/tests/testprojecttest/lib/LibActivity.java
diff --git a/samples/applibtest/lib/src/main/res/layout/main.xml b/tests/applibtest/lib/src/main/res/layout/main.xml
index 14a9c4b..14a9c4b 100644
--- a/samples/applibtest/lib/src/main/res/layout/main.xml
+++ b/tests/applibtest/lib/src/main/res/layout/main.xml
diff --git a/samples/applibtest/lib/src/main/res/values/strings.xml b/tests/applibtest/lib/src/main/res/values/strings.xml
index fdb2272..fdb2272 100644
--- a/samples/applibtest/lib/src/main/res/values/strings.xml
+++ b/tests/applibtest/lib/src/main/res/values/strings.xml
diff --git a/samples/applibtest/lib/src/test/java/com/android/tests/testprojecttest/lib/LibActivityTest.java b/tests/applibtest/lib/src/test/java/com/android/tests/testprojecttest/lib/LibActivityTest.java
index 6632c58..6632c58 100644
--- a/samples/applibtest/lib/src/test/java/com/android/tests/testprojecttest/lib/LibActivityTest.java
+++ b/tests/applibtest/lib/src/test/java/com/android/tests/testprojecttest/lib/LibActivityTest.java
diff --git a/samples/applibtest/lib/src/test/java/com/android/tests/testprojecttest/test/AllTests.java b/tests/applibtest/lib/src/test/java/com/android/tests/testprojecttest/test/AllTests.java
index a77b53c..a77b53c 100644
--- a/samples/applibtest/lib/src/test/java/com/android/tests/testprojecttest/test/AllTests.java
+++ b/tests/applibtest/lib/src/test/java/com/android/tests/testprojecttest/test/AllTests.java
diff --git a/samples/applibtest/lib/src/test/res/values/strings.xml b/tests/applibtest/lib/src/test/res/values/strings.xml
index 17781ee..17781ee 100644
--- a/samples/applibtest/lib/src/test/res/values/strings.xml
+++ b/tests/applibtest/lib/src/test/res/values/strings.xml
diff --git a/samples/applibtest/settings.gradle b/tests/applibtest/settings.gradle
index 5ed7972..5ed7972 100644
--- a/samples/applibtest/settings.gradle
+++ b/tests/applibtest/settings.gradle
diff --git a/tests/basic/build.gradle b/tests/basic/build.gradle
index 3822a01..6f824f8 100644
--- a/tests/basic/build.gradle
+++ b/tests/basic/build.gradle
@@ -21,7 +21,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 16
 
-        signingStoreLocation "debug.keystore"
+        signingStoreLocation "$rootDir/debug.keystore"
         signingStorePassword "android"
         signingKeyAlias "androiddebugkey"
         signingKeyPassword "android"
diff --git a/samples/dependencies/build.gradle b/tests/dependencies/build.gradle
index 206da96..2a0ca62 100644
--- a/samples/dependencies/build.gradle
+++ b/tests/dependencies/build.gradle
@@ -26,7 +26,7 @@ android {
     testBuildType "blah"
 
 	defaultConfig {
-		signingStoreLocation "debug.keystore"
+		signingStoreLocation "$rootDir/debug.keystore"
 		signingStorePassword "android"
 		signingKeyAlias "androiddebugkey"
 		signingKeyPassword "android"
diff --git a/samples/basic/debug.keystore b/tests/dependencies/debug.keystore
index 389278e..389278e 100644
--- a/samples/basic/debug.keystore
+++ b/tests/dependencies/debug.keystore
diff --git a/samples/dependencies/src/main/AndroidManifest.xml b/tests/dependencies/src/main/AndroidManifest.xml
index 1f411e0..1f411e0 100644
--- a/samples/dependencies/src/main/AndroidManifest.xml
+++ b/tests/dependencies/src/main/AndroidManifest.xml
diff --git a/samples/dependencies/src/main/java/org/gradle/sample/BuildType.java b/tests/dependencies/src/main/java/org/gradle/sample/BuildType.java
index 4364026..4364026 100644
--- a/samples/dependencies/src/main/java/org/gradle/sample/BuildType.java
+++ b/tests/dependencies/src/main/java/org/gradle/sample/BuildType.java
diff --git a/samples/dependencies/src/main/java/org/gradle/sample/MainActivity.java b/tests/dependencies/src/main/java/org/gradle/sample/MainActivity.java
index b6b2fb7..b6b2fb7 100644
--- a/samples/dependencies/src/main/java/org/gradle/sample/MainActivity.java
+++ b/tests/dependencies/src/main/java/org/gradle/sample/MainActivity.java
diff --git a/samples/dependencies/src/main/java/org/gradle/sample/Person.java b/tests/dependencies/src/main/java/org/gradle/sample/Person.java
index b6fcb27..b6fcb27 100644
--- a/samples/dependencies/src/main/java/org/gradle/sample/Person.java
+++ b/tests/dependencies/src/main/java/org/gradle/sample/Person.java
diff --git a/samples/dependencies/src/main/java/org/gradle/sample/ShowPeopleActivity.java b/tests/dependencies/src/main/java/org/gradle/sample/ShowPeopleActivity.java
index 24a739a..24a739a 100644
--- a/samples/dependencies/src/main/java/org/gradle/sample/ShowPeopleActivity.java
+++ b/tests/dependencies/src/main/java/org/gradle/sample/ShowPeopleActivity.java
diff --git a/samples/dependencies/src/main/res/drawable-hdpi/ic_launcher.png b/tests/dependencies/src/main/res/drawable-hdpi/ic_launcher.png
index 96a442e..96a442e 100644
--- a/samples/dependencies/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/tests/dependencies/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/samples/dependencies/src/main/res/drawable-ldpi/ic_launcher.png b/tests/dependencies/src/main/res/drawable-ldpi/ic_launcher.png
index 9923872..9923872 100644
--- a/samples/dependencies/src/main/res/drawable-ldpi/ic_launcher.png
+++ b/tests/dependencies/src/main/res/drawable-ldpi/ic_launcher.png
diff --git a/samples/dependencies/src/main/res/drawable-mdpi/ic_launcher.png b/tests/dependencies/src/main/res/drawable-mdpi/ic_launcher.png
index 359047d..359047d 100644
--- a/samples/dependencies/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/tests/dependencies/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/samples/dependencies/src/main/res/drawable-xhdpi/ic_launcher.png b/tests/dependencies/src/main/res/drawable-xhdpi/ic_launcher.png
index 71c6d76..71c6d76 100644
--- a/samples/dependencies/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/tests/dependencies/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/samples/dependencies/src/main/res/layout/main.xml b/tests/dependencies/src/main/res/layout/main.xml
index ccc59fb..ccc59fb 100644
--- a/samples/dependencies/src/main/res/layout/main.xml
+++ b/tests/dependencies/src/main/res/layout/main.xml
diff --git a/samples/dependencies/src/main/res/values/strings.xml b/tests/dependencies/src/main/res/values/strings.xml
index 8eda275..8eda275 100644
--- a/samples/dependencies/src/main/res/values/strings.xml
+++ b/tests/dependencies/src/main/res/values/strings.xml
diff --git a/samples/flavored/build.gradle b/tests/flavored/build.gradle
index 6daf4a4..7464ca0 100644
--- a/samples/flavored/build.gradle
+++ b/tests/flavored/build.gradle
@@ -17,7 +17,7 @@ android {
     
 
     defaultConfig {
-        signingStoreLocation = "debug.keystore"
+        signingStoreLocation = "$rootDir/debug.keystore"
         signingStorePassword = "android"
         signingKeyAlias = "androiddebugkey"
         signingKeyPassword = "android"
diff --git a/samples/dependencies/debug.keystore b/tests/flavored/debug.keystore
index 389278e..389278e 100644
--- a/samples/dependencies/debug.keystore
+++ b/tests/flavored/debug.keystore
diff --git a/samples/flavored/src/f1/res/values/strings.xml b/tests/flavored/src/f1/res/values/strings.xml
index f081f40..f081f40 100644
--- a/samples/flavored/src/f1/res/values/strings.xml
+++ b/tests/flavored/src/f1/res/values/strings.xml
diff --git a/samples/flavored/src/f2/AndroidManifest.xml b/tests/flavored/src/f2/AndroidManifest.xml
index ce0bb8d..ce0bb8d 100644
--- a/samples/flavored/src/f2/AndroidManifest.xml
+++ b/tests/flavored/src/f2/AndroidManifest.xml
diff --git a/samples/flavored/src/f2/java/com/android/tests/flavored/OtherActivity.java b/tests/flavored/src/f2/java/com/android/tests/flavored/OtherActivity.java
index 6ffac9c..6ffac9c 100644
--- a/samples/flavored/src/f2/java/com/android/tests/flavored/OtherActivity.java
+++ b/tests/flavored/src/f2/java/com/android/tests/flavored/OtherActivity.java
diff --git a/samples/flavored/src/f2/res/layout/main2.xml b/tests/flavored/src/f2/res/layout/main2.xml
index 90c3c43..90c3c43 100644
--- a/samples/flavored/src/f2/res/layout/main2.xml
+++ b/tests/flavored/src/f2/res/layout/main2.xml
diff --git a/samples/flavored/src/f2/res/values/strings.xml b/tests/flavored/src/f2/res/values/strings.xml
index bb53fd4..bb53fd4 100644
--- a/samples/flavored/src/f2/res/values/strings.xml
+++ b/tests/flavored/src/f2/res/values/strings.xml
diff --git a/samples/flavored/src/main/AndroidManifest.xml b/tests/flavored/src/main/AndroidManifest.xml
index 0d1c338..0d1c338 100644
--- a/samples/flavored/src/main/AndroidManifest.xml
+++ b/tests/flavored/src/main/AndroidManifest.xml
diff --git a/samples/flavored/src/main/java/com/android/tests/flavored/Main.java b/tests/flavored/src/main/java/com/android/tests/flavored/Main.java
index 26debd3..26debd3 100644
--- a/samples/flavored/src/main/java/com/android/tests/flavored/Main.java
+++ b/tests/flavored/src/main/java/com/android/tests/flavored/Main.java
diff --git a/samples/basic/src/main/res/drawable/icon.png b/tests/flavored/src/main/res/drawable/icon.png
index a07c69f..a07c69f 100644
--- a/samples/basic/src/main/res/drawable/icon.png
+++ b/tests/flavored/src/main/res/drawable/icon.png
diff --git a/samples/flavored/src/main/res/layout/main.xml b/tests/flavored/src/main/res/layout/main.xml
index 058715f..058715f 100644
--- a/samples/flavored/src/main/res/layout/main.xml
+++ b/tests/flavored/src/main/res/layout/main.xml
diff --git a/samples/flavored/src/main/res/values/strings.xml b/tests/flavored/src/main/res/values/strings.xml
index 24db545..24db545 100644
--- a/samples/flavored/src/main/res/values/strings.xml
+++ b/tests/flavored/src/main/res/values/strings.xml
diff --git a/samples/flavored/src/test/java/com/android/tests/flavored/MainTest.java b/tests/flavored/src/test/java/com/android/tests/flavored/MainTest.java
index f44e0f0..f44e0f0 100644
--- a/samples/flavored/src/test/java/com/android/tests/flavored/MainTest.java
+++ b/tests/flavored/src/test/java/com/android/tests/flavored/MainTest.java
diff --git a/samples/flavored/src/testF2/java/com/android/tests/flavored/OtherActivityTest.java b/tests/flavored/src/testF2/java/com/android/tests/flavored/OtherActivityTest.java
index 11d8c64..11d8c64 100644
--- a/samples/flavored/src/testF2/java/com/android/tests/flavored/OtherActivityTest.java
+++ b/tests/flavored/src/testF2/java/com/android/tests/flavored/OtherActivityTest.java
diff --git a/samples/flavorlib/app/build.gradle b/tests/flavorlib/app/build.gradle
index dcaac3c..dcaac3c 100644
--- a/samples/flavorlib/app/build.gradle
+++ b/tests/flavorlib/app/build.gradle
diff --git a/samples/flavorlib/app/proguard-project.txt b/tests/flavorlib/app/proguard-project.txt
index 349f80f..349f80f 100644
--- a/samples/flavorlib/app/proguard-project.txt
+++ b/tests/flavorlib/app/proguard-project.txt
diff --git a/samples/flavorlib/app/src/flavor1/res/values/strings.xml b/tests/flavorlib/app/src/flavor1/res/values/strings.xml
index b402efb..b402efb 100644
--- a/samples/flavorlib/app/src/flavor1/res/values/strings.xml
+++ b/tests/flavorlib/app/src/flavor1/res/values/strings.xml
diff --git a/samples/flavorlib/app/src/flavor2/res/values/strings.xml b/tests/flavorlib/app/src/flavor2/res/values/strings.xml
index af1b43c..af1b43c 100644
--- a/samples/flavorlib/app/src/flavor2/res/values/strings.xml
+++ b/tests/flavorlib/app/src/flavor2/res/values/strings.xml
diff --git a/samples/flavorlib/app/src/main/AndroidManifest.xml b/tests/flavorlib/app/src/main/AndroidManifest.xml
index 45758cc..45758cc 100644
--- a/samples/flavorlib/app/src/main/AndroidManifest.xml
+++ b/tests/flavorlib/app/src/main/AndroidManifest.xml
diff --git a/samples/flavorlib/app/src/main/java/com/android/tests/flavorlib/app/App.java b/tests/flavorlib/app/src/main/java/com/android/tests/flavorlib/app/App.java
index 0312a6c..0312a6c 100644
--- a/samples/flavorlib/app/src/main/java/com/android/tests/flavorlib/app/App.java
+++ b/tests/flavorlib/app/src/main/java/com/android/tests/flavorlib/app/App.java
diff --git a/samples/flavorlib/app/src/main/java/com/android/tests/flavorlib/app/MainActivity.java b/tests/flavorlib/app/src/main/java/com/android/tests/flavorlib/app/MainActivity.java
index 0d6f8a6..0d6f8a6 100644
--- a/samples/flavorlib/app/src/main/java/com/android/tests/flavorlib/app/MainActivity.java
+++ b/tests/flavorlib/app/src/main/java/com/android/tests/flavorlib/app/MainActivity.java
diff --git a/samples/flavorlib/app/src/main/res/drawable-hdpi/icon.png b/tests/flavorlib/app/src/main/res/drawable-hdpi/icon.png
index 8074c4c..8074c4c 100644
--- a/samples/flavorlib/app/src/main/res/drawable-hdpi/icon.png
+++ b/tests/flavorlib/app/src/main/res/drawable-hdpi/icon.png
diff --git a/samples/flavorlib/app/src/main/res/drawable-ldpi/icon.png b/tests/flavorlib/app/src/main/res/drawable-ldpi/icon.png
index 1095584..1095584 100644
--- a/samples/flavorlib/app/src/main/res/drawable-ldpi/icon.png
+++ b/tests/flavorlib/app/src/main/res/drawable-ldpi/icon.png
diff --git a/samples/flavored/src/main/res/drawable/icon.png b/tests/flavorlib/app/src/main/res/drawable-mdpi/icon.png
index a07c69f..a07c69f 100644
--- a/samples/flavored/src/main/res/drawable/icon.png
+++ b/tests/flavorlib/app/src/main/res/drawable-mdpi/icon.png
diff --git a/samples/flavorlib/app/src/main/res/layout/main.xml b/tests/flavorlib/app/src/main/res/layout/main.xml
index 6761bef..6761bef 100644
--- a/samples/flavorlib/app/src/main/res/layout/main.xml
+++ b/tests/flavorlib/app/src/main/res/layout/main.xml
diff --git a/samples/flavorlib/app/src/main/res/values/strings.xml b/tests/flavorlib/app/src/main/res/values/strings.xml
index 190a400..190a400 100644
--- a/samples/flavorlib/app/src/main/res/values/strings.xml
+++ b/tests/flavorlib/app/src/main/res/values/strings.xml
diff --git a/samples/flavorlib/app/src/main/resources/com/android/tests/flavorlib/app/App.txt b/tests/flavorlib/app/src/main/resources/com/android/tests/flavorlib/app/App.txt
index 084e7d0..084e7d0 100644
--- a/samples/flavorlib/app/src/main/resources/com/android/tests/flavorlib/app/App.txt
+++ b/tests/flavorlib/app/src/main/resources/com/android/tests/flavorlib/app/App.txt
diff --git a/samples/flavorlib/app/src/test/java/com/android/tests/flavorlib/app/MainActivityTest.java b/tests/flavorlib/app/src/test/java/com/android/tests/flavorlib/app/MainActivityTest.java
index 2788b27..2788b27 100644
--- a/samples/flavorlib/app/src/test/java/com/android/tests/flavorlib/app/MainActivityTest.java
+++ b/tests/flavorlib/app/src/test/java/com/android/tests/flavorlib/app/MainActivityTest.java
diff --git a/samples/flavorlib/app/src/testFlavor1/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java b/tests/flavorlib/app/src/testFlavor1/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java
index 6dd5088..6dd5088 100644
--- a/samples/flavorlib/app/src/testFlavor1/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java
+++ b/tests/flavorlib/app/src/testFlavor1/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java
diff --git a/samples/flavorlib/app/src/testFlavor2/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java b/tests/flavorlib/app/src/testFlavor2/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java
index 56988c0..56988c0 100644
--- a/samples/flavorlib/app/src/testFlavor2/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java
+++ b/tests/flavorlib/app/src/testFlavor2/java/com/android/tests/flavorlib/app/MainActivityFlavorTest.java
diff --git a/samples/flavorlib/build.gradle b/tests/flavorlib/build.gradle
index a0832c6..a0832c6 100644
--- a/samples/flavorlib/build.gradle
+++ b/tests/flavorlib/build.gradle
diff --git a/samples/flavorlib/lib1/build.gradle b/tests/flavorlib/lib1/build.gradle
index f7838fb..f7838fb 100644
--- a/samples/flavorlib/lib1/build.gradle
+++ b/tests/flavorlib/lib1/build.gradle
diff --git a/samples/flavorlib/lib1/proguard-project.txt b/tests/flavorlib/lib1/proguard-project.txt
index f2fe155..f2fe155 100644
--- a/samples/flavorlib/lib1/proguard-project.txt
+++ b/tests/flavorlib/lib1/proguard-project.txt
diff --git a/samples/flavorlib/lib1/src/main/AndroidManifest.xml b/tests/flavorlib/lib1/src/main/AndroidManifest.xml
index 44bc277..44bc277 100644
--- a/samples/flavorlib/lib1/src/main/AndroidManifest.xml
+++ b/tests/flavorlib/lib1/src/main/AndroidManifest.xml
diff --git a/samples/flavorlib/lib1/src/main/java/com/android/tests/flavorlib/lib/Lib.java b/tests/flavorlib/lib1/src/main/java/com/android/tests/flavorlib/lib/Lib.java
index 1e981c2..1e981c2 100644
--- a/samples/flavorlib/lib1/src/main/java/com/android/tests/flavorlib/lib/Lib.java
+++ b/tests/flavorlib/lib1/src/main/java/com/android/tests/flavorlib/lib/Lib.java
diff --git a/samples/flavorlib/lib1/src/main/java/com/android/tests/flavorlib/lib/MainActivity.java b/tests/flavorlib/lib1/src/main/java/com/android/tests/flavorlib/lib/MainActivity.java
index 8a13e9b..8a13e9b 100644
--- a/samples/flavorlib/lib1/src/main/java/com/android/tests/flavorlib/lib/MainActivity.java
+++ b/tests/flavorlib/lib1/src/main/java/com/android/tests/flavorlib/lib/MainActivity.java
diff --git a/samples/flavorlib/lib1/src/main/res/drawable-hdpi/ic_launcher.png b/tests/flavorlib/lib1/src/main/res/drawable-hdpi/ic_launcher.png
index 8074c4c..8074c4c 100644
--- a/samples/flavorlib/lib1/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/tests/flavorlib/lib1/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/samples/flavorlib/lib1/src/main/res/drawable-ldpi/ic_launcher.png b/tests/flavorlib/lib1/src/main/res/drawable-ldpi/ic_launcher.png
index 1095584..1095584 100644
--- a/samples/flavorlib/lib1/src/main/res/drawable-ldpi/ic_launcher.png
+++ b/tests/flavorlib/lib1/src/main/res/drawable-ldpi/ic_launcher.png
diff --git a/samples/flavorlib/lib1/src/main/res/drawable-mdpi/ic_launcher.png b/tests/flavorlib/lib1/src/main/res/drawable-mdpi/ic_launcher.png
index a07c69f..a07c69f 100644
--- a/samples/flavorlib/lib1/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/tests/flavorlib/lib1/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/samples/flavorlib/lib1/src/main/res/layout/lib_main.xml b/tests/flavorlib/lib1/src/main/res/layout/lib_main.xml
index 47e792a..47e792a 100644
--- a/samples/flavorlib/lib1/src/main/res/layout/lib_main.xml
+++ b/tests/flavorlib/lib1/src/main/res/layout/lib_main.xml
diff --git a/samples/flavorlib/lib1/src/main/res/values/strings.xml b/tests/flavorlib/lib1/src/main/res/values/strings.xml
index ca7dcdb..ca7dcdb 100644
--- a/samples/flavorlib/lib1/src/main/res/values/strings.xml
+++ b/tests/flavorlib/lib1/src/main/res/values/strings.xml
diff --git a/samples/flavorlib/lib1/src/main/resources/com/android/tests/flavorlib/lib/Lib.txt b/tests/flavorlib/lib1/src/main/resources/com/android/tests/flavorlib/lib/Lib.txt
index 452e397..452e397 100644
--- a/samples/flavorlib/lib1/src/main/resources/com/android/tests/flavorlib/lib/Lib.txt
+++ b/tests/flavorlib/lib1/src/main/resources/com/android/tests/flavorlib/lib/Lib.txt
diff --git a/samples/flavorlib/lib1/src/test/java/com/android/tests/flavorlib/lib/MainActivityTest.java b/tests/flavorlib/lib1/src/test/java/com/android/tests/flavorlib/lib/MainActivityTest.java
index 970fcbe..970fcbe 100644
--- a/samples/flavorlib/lib1/src/test/java/com/android/tests/flavorlib/lib/MainActivityTest.java
+++ b/tests/flavorlib/lib1/src/test/java/com/android/tests/flavorlib/lib/MainActivityTest.java
diff --git a/samples/flavorlib/lib2/build.gradle b/tests/flavorlib/lib2/build.gradle
index f7838fb..f7838fb 100644
--- a/samples/flavorlib/lib2/build.gradle
+++ b/tests/flavorlib/lib2/build.gradle
diff --git a/samples/flavorlib/lib2/proguard-project.txt b/tests/flavorlib/lib2/proguard-project.txt
index f2fe155..f2fe155 100644
--- a/samples/flavorlib/lib2/proguard-project.txt
+++ b/tests/flavorlib/lib2/proguard-project.txt
diff --git a/samples/flavorlib/lib2/src/main/AndroidManifest.xml b/tests/flavorlib/lib2/src/main/AndroidManifest.xml
index 44bc277..44bc277 100644
--- a/samples/flavorlib/lib2/src/main/AndroidManifest.xml
+++ b/tests/flavorlib/lib2/src/main/AndroidManifest.xml
diff --git a/samples/flavorlib/lib2/src/main/java/com/android/tests/flavorlib/lib/Lib.java b/tests/flavorlib/lib2/src/main/java/com/android/tests/flavorlib/lib/Lib.java
index 4d8503c..4d8503c 100644
--- a/samples/flavorlib/lib2/src/main/java/com/android/tests/flavorlib/lib/Lib.java
+++ b/tests/flavorlib/lib2/src/main/java/com/android/tests/flavorlib/lib/Lib.java
diff --git a/samples/flavorlib/lib2/src/main/java/com/android/tests/flavorlib/lib/MainActivity.java b/tests/flavorlib/lib2/src/main/java/com/android/tests/flavorlib/lib/MainActivity.java
index 8a13e9b..8a13e9b 100644
--- a/samples/flavorlib/lib2/src/main/java/com/android/tests/flavorlib/lib/MainActivity.java
+++ b/tests/flavorlib/lib2/src/main/java/com/android/tests/flavorlib/lib/MainActivity.java
diff --git a/samples/flavorlib/lib2/src/main/res/drawable-hdpi/ic_launcher.png b/tests/flavorlib/lib2/src/main/res/drawable-hdpi/ic_launcher.png
index 8074c4c..8074c4c 100644
--- a/samples/flavorlib/lib2/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/tests/flavorlib/lib2/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/samples/flavorlib/lib2/src/main/res/drawable-ldpi/ic_launcher.png b/tests/flavorlib/lib2/src/main/res/drawable-ldpi/ic_launcher.png
index 1095584..1095584 100644
--- a/samples/flavorlib/lib2/src/main/res/drawable-ldpi/ic_launcher.png
+++ b/tests/flavorlib/lib2/src/main/res/drawable-ldpi/ic_launcher.png
diff --git a/samples/flavorlib/lib2/src/main/res/drawable-mdpi/ic_launcher.png b/tests/flavorlib/lib2/src/main/res/drawable-mdpi/ic_launcher.png
index a07c69f..a07c69f 100644
--- a/samples/flavorlib/lib2/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/tests/flavorlib/lib2/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/samples/flavorlib/lib2/src/main/res/layout/lib_main.xml b/tests/flavorlib/lib2/src/main/res/layout/lib_main.xml
index 47e792a..47e792a 100644
--- a/samples/flavorlib/lib2/src/main/res/layout/lib_main.xml
+++ b/tests/flavorlib/lib2/src/main/res/layout/lib_main.xml
diff --git a/samples/flavorlib/lib2/src/main/res/values/strings.xml b/tests/flavorlib/lib2/src/main/res/values/strings.xml
index e27cb40..e27cb40 100644
--- a/samples/flavorlib/lib2/src/main/res/values/strings.xml
+++ b/tests/flavorlib/lib2/src/main/res/values/strings.xml
diff --git a/samples/flavorlib/lib2/src/main/resources/com/android/tests/flavorlib/lib/Lib.txt b/tests/flavorlib/lib2/src/main/resources/com/android/tests/flavorlib/lib/Lib.txt
index 94cabe4..94cabe4 100644
--- a/samples/flavorlib/lib2/src/main/resources/com/android/tests/flavorlib/lib/Lib.txt
+++ b/tests/flavorlib/lib2/src/main/resources/com/android/tests/flavorlib/lib/Lib.txt
diff --git a/samples/flavorlib/lib2/src/test/java/com/android/tests/flavorlib/lib/MainActivityTest.java b/tests/flavorlib/lib2/src/test/java/com/android/tests/flavorlib/lib/MainActivityTest.java
index 05a12e5..05a12e5 100644
--- a/samples/flavorlib/lib2/src/test/java/com/android/tests/flavorlib/lib/MainActivityTest.java
+++ b/tests/flavorlib/lib2/src/test/java/com/android/tests/flavorlib/lib/MainActivityTest.java
diff --git a/samples/flavorlib/settings.gradle b/tests/flavorlib/settings.gradle
index c72f855..c72f855 100644
--- a/samples/flavorlib/settings.gradle
+++ b/tests/flavorlib/settings.gradle
diff --git a/samples/flavors/build.gradle b/tests/flavors/build.gradle
index cc59029..cc59029 100644
--- a/samples/flavors/build.gradle
+++ b/tests/flavors/build.gradle
diff --git a/samples/flavors/proguard-project.txt b/tests/flavors/proguard-project.txt
index 349f80f..349f80f 100644
--- a/samples/flavors/proguard-project.txt
+++ b/tests/flavors/proguard-project.txt
diff --git a/samples/flavors/src/f1/java/com/android/tests/flavors/group1/SomeClass.java b/tests/flavors/src/f1/java/com/android/tests/flavors/group1/SomeClass.java
index a5c30b2..a5c30b2 100644
--- a/samples/flavors/src/f1/java/com/android/tests/flavors/group1/SomeClass.java
+++ b/tests/flavors/src/f1/java/com/android/tests/flavors/group1/SomeClass.java
diff --git a/samples/flavors/src/f1/res/values/strings.xml b/tests/flavors/src/f1/res/values/strings.xml
index 73e7584..73e7584 100644
--- a/samples/flavors/src/f1/res/values/strings.xml
+++ b/tests/flavors/src/f1/res/values/strings.xml
diff --git a/samples/flavors/src/f2/java/com/android/tests/flavors/group1/SomeClass.java b/tests/flavors/src/f2/java/com/android/tests/flavors/group1/SomeClass.java
index 5974587..5974587 100644
--- a/samples/flavors/src/f2/java/com/android/tests/flavors/group1/SomeClass.java
+++ b/tests/flavors/src/f2/java/com/android/tests/flavors/group1/SomeClass.java
diff --git a/samples/flavors/src/f2/res/values/strings.xml b/tests/flavors/src/f2/res/values/strings.xml
index 855e7f6..855e7f6 100644
--- a/samples/flavors/src/f2/res/values/strings.xml
+++ b/tests/flavors/src/f2/res/values/strings.xml
diff --git a/samples/flavors/src/fa/java/com/android/tests/flavors/group2/SomeClass.java b/tests/flavors/src/fa/java/com/android/tests/flavors/group2/SomeClass.java
index 40a939e..40a939e 100644
--- a/samples/flavors/src/fa/java/com/android/tests/flavors/group2/SomeClass.java
+++ b/tests/flavors/src/fa/java/com/android/tests/flavors/group2/SomeClass.java
diff --git a/samples/flavors/src/fa/res/values/strings.xml b/tests/flavors/src/fa/res/values/strings.xml
index 331cb90..331cb90 100644
--- a/samples/flavors/src/fa/res/values/strings.xml
+++ b/tests/flavors/src/fa/res/values/strings.xml
diff --git a/samples/flavors/src/fb/java/com/android/tests/flavors/group2/SomeClass.java b/tests/flavors/src/fb/java/com/android/tests/flavors/group2/SomeClass.java
index 7441b61..7441b61 100644
--- a/samples/flavors/src/fb/java/com/android/tests/flavors/group2/SomeClass.java
+++ b/tests/flavors/src/fb/java/com/android/tests/flavors/group2/SomeClass.java
diff --git a/samples/flavors/src/fb/res/values/strings.xml b/tests/flavors/src/fb/res/values/strings.xml
index fa0733f..fa0733f 100644
--- a/samples/flavors/src/fb/res/values/strings.xml
+++ b/tests/flavors/src/fb/res/values/strings.xml
diff --git a/samples/flavors/src/main/AndroidManifest.xml b/tests/flavors/src/main/AndroidManifest.xml
index e173c44..e173c44 100644
--- a/samples/flavors/src/main/AndroidManifest.xml
+++ b/tests/flavors/src/main/AndroidManifest.xml
diff --git a/samples/flavors/src/main/java/com/android/tests/flavors/MainActivity.java b/tests/flavors/src/main/java/com/android/tests/flavors/MainActivity.java
index 6968643..6968643 100644
--- a/samples/flavors/src/main/java/com/android/tests/flavors/MainActivity.java
+++ b/tests/flavors/src/main/java/com/android/tests/flavors/MainActivity.java
diff --git a/samples/flavors/src/main/res/drawable-hdpi/icon.png b/tests/flavors/src/main/res/drawable-hdpi/icon.png
index 8074c4c..8074c4c 100644
--- a/samples/flavors/src/main/res/drawable-hdpi/icon.png
+++ b/tests/flavors/src/main/res/drawable-hdpi/icon.png
diff --git a/samples/flavors/src/main/res/drawable-ldpi/icon.png b/tests/flavors/src/main/res/drawable-ldpi/icon.png
index 1095584..1095584 100644
--- a/samples/flavors/src/main/res/drawable-ldpi/icon.png
+++ b/tests/flavors/src/main/res/drawable-ldpi/icon.png
diff --git a/samples/flavorlib/app/src/main/res/drawable-mdpi/icon.png b/tests/flavors/src/main/res/drawable-mdpi/icon.png
index a07c69f..a07c69f 100644
--- a/samples/flavorlib/app/src/main/res/drawable-mdpi/icon.png
+++ b/tests/flavors/src/main/res/drawable-mdpi/icon.png
diff --git a/samples/flavors/src/main/res/layout/main.xml b/tests/flavors/src/main/res/layout/main.xml
index c9814d1..c9814d1 100644
--- a/samples/flavors/src/main/res/layout/main.xml
+++ b/tests/flavors/src/main/res/layout/main.xml
diff --git a/samples/flavors/src/main/res/values/strings.xml b/tests/flavors/src/main/res/values/strings.xml
index dd71753..dd71753 100644
--- a/samples/flavors/src/main/res/values/strings.xml
+++ b/tests/flavors/src/main/res/values/strings.xml
diff --git a/samples/flavors/src/testF1/java/com/android/tests/flavors/MainActivityGroup1Test.java b/tests/flavors/src/testF1/java/com/android/tests/flavors/MainActivityGroup1Test.java
index 2c043ef..2c043ef 100644
--- a/samples/flavors/src/testF1/java/com/android/tests/flavors/MainActivityGroup1Test.java
+++ b/tests/flavors/src/testF1/java/com/android/tests/flavors/MainActivityGroup1Test.java
diff --git a/samples/flavors/src/testF2/java/com/android/tests/flavors/MainActivityGroup1Test.java b/tests/flavors/src/testF2/java/com/android/tests/flavors/MainActivityGroup1Test.java
index 41e9ecf..41e9ecf 100644
--- a/samples/flavors/src/testF2/java/com/android/tests/flavors/MainActivityGroup1Test.java
+++ b/tests/flavors/src/testF2/java/com/android/tests/flavors/MainActivityGroup1Test.java
diff --git a/samples/flavors/src/testFa/java/com/android/tests/flavors/MainActivityGroup2Test.java b/tests/flavors/src/testFa/java/com/android/tests/flavors/MainActivityGroup2Test.java
index 0d0fee2..0d0fee2 100644
--- a/samples/flavors/src/testFa/java/com/android/tests/flavors/MainActivityGroup2Test.java
+++ b/tests/flavors/src/testFa/java/com/android/tests/flavors/MainActivityGroup2Test.java
diff --git a/samples/flavors/src/testFb/java/com/android/tests/flavors/MainActivityGroup2Test.java b/tests/flavors/src/testFb/java/com/android/tests/flavors/MainActivityGroup2Test.java
index 6f92adf..6f92adf 100644
--- a/samples/flavors/src/testFb/java/com/android/tests/flavors/MainActivityGroup2Test.java
+++ b/tests/flavors/src/testFb/java/com/android/tests/flavors/MainActivityGroup2Test.java
diff --git a/samples/libsTest/app/build.gradle b/tests/libsTest/app/build.gradle
index 29c70bc..29c70bc 100644
--- a/samples/libsTest/app/build.gradle
+++ b/tests/libsTest/app/build.gradle
diff --git a/samples/libsTest/app/proguard-project.txt b/tests/libsTest/app/proguard-project.txt
index 349f80f..349f80f 100644
--- a/samples/libsTest/app/proguard-project.txt
+++ b/tests/libsTest/app/proguard-project.txt
diff --git a/samples/libsTest/app/src/main/AndroidManifest.xml b/tests/libsTest/app/src/main/AndroidManifest.xml
index 74f0ff2..74f0ff2 100644
--- a/samples/libsTest/app/src/main/AndroidManifest.xml
+++ b/tests/libsTest/app/src/main/AndroidManifest.xml
diff --git a/samples/libsTest/app/src/main/java/com/android/tests/libstest/app/App.java b/tests/libsTest/app/src/main/java/com/android/tests/libstest/app/App.java
index 54e2a09..54e2a09 100644
--- a/samples/libsTest/app/src/main/java/com/android/tests/libstest/app/App.java
+++ b/tests/libsTest/app/src/main/java/com/android/tests/libstest/app/App.java
diff --git a/samples/libsTest/app/src/main/java/com/android/tests/libstest/app/MainActivity.java b/tests/libsTest/app/src/main/java/com/android/tests/libstest/app/MainActivity.java
index 8992066..8992066 100644
--- a/samples/libsTest/app/src/main/java/com/android/tests/libstest/app/MainActivity.java
+++ b/tests/libsTest/app/src/main/java/com/android/tests/libstest/app/MainActivity.java
diff --git a/samples/libsTest/app/src/main/res/drawable-hdpi/icon.png b/tests/libsTest/app/src/main/res/drawable-hdpi/icon.png
index 8074c4c..8074c4c 100644
--- a/samples/libsTest/app/src/main/res/drawable-hdpi/icon.png
+++ b/tests/libsTest/app/src/main/res/drawable-hdpi/icon.png
diff --git a/samples/libsTest/app/src/main/res/drawable-ldpi/icon.png b/tests/libsTest/app/src/main/res/drawable-ldpi/icon.png
index 1095584..1095584 100644
--- a/samples/libsTest/app/src/main/res/drawable-ldpi/icon.png
+++ b/tests/libsTest/app/src/main/res/drawable-ldpi/icon.png
diff --git a/samples/flavors/src/main/res/drawable-mdpi/icon.png b/tests/libsTest/app/src/main/res/drawable-mdpi/icon.png
index a07c69f..a07c69f 100644
--- a/samples/flavors/src/main/res/drawable-mdpi/icon.png
+++ b/tests/libsTest/app/src/main/res/drawable-mdpi/icon.png
diff --git a/samples/libsTest/app/src/main/res/layout/main.xml b/tests/libsTest/app/src/main/res/layout/main.xml
index f735960..f735960 100644
--- a/samples/libsTest/app/src/main/res/layout/main.xml
+++ b/tests/libsTest/app/src/main/res/layout/main.xml
diff --git a/samples/libsTest/app/src/main/res/values/strings.xml b/tests/libsTest/app/src/main/res/values/strings.xml
index 2a2e006..2a2e006 100644
--- a/samples/libsTest/app/src/main/res/values/strings.xml
+++ b/tests/libsTest/app/src/main/res/values/strings.xml
diff --git a/samples/libsTest/app/src/main/resources/com/android/tests/libstest/app/App.txt b/tests/libsTest/app/src/main/resources/com/android/tests/libstest/app/App.txt
index 084e7d0..084e7d0 100644
--- a/samples/libsTest/app/src/main/resources/com/android/tests/libstest/app/App.txt
+++ b/tests/libsTest/app/src/main/resources/com/android/tests/libstest/app/App.txt
diff --git a/samples/libsTest/app/src/test/java/com/android/tests/libstest/app/MainActivityTest.java b/tests/libsTest/app/src/test/java/com/android/tests/libstest/app/MainActivityTest.java
index 012a4e2..012a4e2 100644
--- a/samples/libsTest/app/src/test/java/com/android/tests/libstest/app/MainActivityTest.java
+++ b/tests/libsTest/app/src/test/java/com/android/tests/libstest/app/MainActivityTest.java
diff --git a/samples/libsTest/build.gradle b/tests/libsTest/build.gradle
index a0832c6..a0832c6 100644
--- a/samples/libsTest/build.gradle
+++ b/tests/libsTest/build.gradle
diff --git a/samples/libsTest/lib1/build.gradle b/tests/libsTest/lib1/build.gradle
index 3624c3b..3624c3b 100644
--- a/samples/libsTest/lib1/build.gradle
+++ b/tests/libsTest/lib1/build.gradle
diff --git a/samples/libsTest/lib1/proguard-project.txt b/tests/libsTest/lib1/proguard-project.txt
index f2fe155..f2fe155 100644
--- a/samples/libsTest/lib1/proguard-project.txt
+++ b/tests/libsTest/lib1/proguard-project.txt
diff --git a/samples/libsTest/lib1/src/main/AndroidManifest.xml b/tests/libsTest/lib1/src/main/AndroidManifest.xml
index 7739b4a..7739b4a 100644
--- a/samples/libsTest/lib1/src/main/AndroidManifest.xml
+++ b/tests/libsTest/lib1/src/main/AndroidManifest.xml
diff --git a/samples/libsTest/lib1/src/main/java/com/android/tests/libstest/lib1/Lib1.java b/tests/libsTest/lib1/src/main/java/com/android/tests/libstest/lib1/Lib1.java
index c62bec2..c62bec2 100644
--- a/samples/libsTest/lib1/src/main/java/com/android/tests/libstest/lib1/Lib1.java
+++ b/tests/libsTest/lib1/src/main/java/com/android/tests/libstest/lib1/Lib1.java
diff --git a/samples/libsTest/lib1/src/main/java/com/android/tests/libstest/lib1/MainActivity.java b/tests/libsTest/lib1/src/main/java/com/android/tests/libstest/lib1/MainActivity.java
index 078bf64..078bf64 100644
--- a/samples/libsTest/lib1/src/main/java/com/android/tests/libstest/lib1/MainActivity.java
+++ b/tests/libsTest/lib1/src/main/java/com/android/tests/libstest/lib1/MainActivity.java
diff --git a/samples/libsTest/lib1/src/main/res/drawable-hdpi/ic_launcher.png b/tests/libsTest/lib1/src/main/res/drawable-hdpi/ic_launcher.png
index 8074c4c..8074c4c 100644
--- a/samples/libsTest/lib1/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/tests/libsTest/lib1/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/samples/libsTest/lib1/src/main/res/drawable-ldpi/ic_launcher.png b/tests/libsTest/lib1/src/main/res/drawable-ldpi/ic_launcher.png
index 1095584..1095584 100644
--- a/samples/libsTest/lib1/src/main/res/drawable-ldpi/ic_launcher.png
+++ b/tests/libsTest/lib1/src/main/res/drawable-ldpi/ic_launcher.png
diff --git a/samples/libsTest/lib1/src/main/res/drawable-mdpi/ic_launcher.png b/tests/libsTest/lib1/src/main/res/drawable-mdpi/ic_launcher.png
index a07c69f..a07c69f 100644
--- a/samples/libsTest/lib1/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/tests/libsTest/lib1/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/samples/libsTest/lib1/src/main/res/layout/lib1_main.xml b/tests/libsTest/lib1/src/main/res/layout/lib1_main.xml
index 3666d12..3666d12 100644
--- a/samples/libsTest/lib1/src/main/res/layout/lib1_main.xml
+++ b/tests/libsTest/lib1/src/main/res/layout/lib1_main.xml
diff --git a/samples/libsTest/lib1/src/main/res/values/strings.xml b/tests/libsTest/lib1/src/main/res/values/strings.xml
index 8d20610..8d20610 100644
--- a/samples/libsTest/lib1/src/main/res/values/strings.xml
+++ b/tests/libsTest/lib1/src/main/res/values/strings.xml
diff --git a/samples/libsTest/lib1/src/main/resources/com/android/tests/libstest/lib1/Lib1.txt b/tests/libsTest/lib1/src/main/resources/com/android/tests/libstest/lib1/Lib1.txt
index 452e397..452e397 100644
--- a/samples/libsTest/lib1/src/main/resources/com/android/tests/libstest/lib1/Lib1.txt
+++ b/tests/libsTest/lib1/src/main/resources/com/android/tests/libstest/lib1/Lib1.txt
diff --git a/samples/libsTest/lib1/src/test/java/com/android/tests/libstest/lib1/MainActivityTest.java b/tests/libsTest/lib1/src/test/java/com/android/tests/libstest/lib1/MainActivityTest.java
index 4ed7ae6..4ed7ae6 100644
--- a/samples/libsTest/lib1/src/test/java/com/android/tests/libstest/lib1/MainActivityTest.java
+++ b/tests/libsTest/lib1/src/test/java/com/android/tests/libstest/lib1/MainActivityTest.java
diff --git a/samples/libsTest/lib2/build.gradle b/tests/libsTest/lib2/build.gradle
index a810790..a810790 100644
--- a/samples/libsTest/lib2/build.gradle
+++ b/tests/libsTest/lib2/build.gradle
diff --git a/samples/libsTest/lib2/proguard-project.txt b/tests/libsTest/lib2/proguard-project.txt
index f2fe155..f2fe155 100644
--- a/samples/libsTest/lib2/proguard-project.txt
+++ b/tests/libsTest/lib2/proguard-project.txt
diff --git a/samples/libsTest/lib2/src/main/AndroidManifest.xml b/tests/libsTest/lib2/src/main/AndroidManifest.xml
index 9374b53..9374b53 100644
--- a/samples/libsTest/lib2/src/main/AndroidManifest.xml
+++ b/tests/libsTest/lib2/src/main/AndroidManifest.xml
diff --git a/samples/libsTest/lib2/src/main/java/com/android/tests/libstest/lib2/Lib2.java b/tests/libsTest/lib2/src/main/java/com/android/tests/libstest/lib2/Lib2.java
index bb8e4db..bb8e4db 100644
--- a/samples/libsTest/lib2/src/main/java/com/android/tests/libstest/lib2/Lib2.java
+++ b/tests/libsTest/lib2/src/main/java/com/android/tests/libstest/lib2/Lib2.java
diff --git a/samples/libsTest/lib2/src/main/java/com/android/tests/libstest/lib2/MainActivity.java b/tests/libsTest/lib2/src/main/java/com/android/tests/libstest/lib2/MainActivity.java
index 012f203..012f203 100644
--- a/samples/libsTest/lib2/src/main/java/com/android/tests/libstest/lib2/MainActivity.java
+++ b/tests/libsTest/lib2/src/main/java/com/android/tests/libstest/lib2/MainActivity.java
diff --git a/samples/libsTest/lib2/src/main/res/drawable-hdpi/ic_launcher.png b/tests/libsTest/lib2/src/main/res/drawable-hdpi/ic_launcher.png
index 8074c4c..8074c4c 100644
--- a/samples/libsTest/lib2/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/tests/libsTest/lib2/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/samples/libsTest/lib2/src/main/res/drawable-ldpi/ic_launcher.png b/tests/libsTest/lib2/src/main/res/drawable-ldpi/ic_launcher.png
index 1095584..1095584 100644
--- a/samples/libsTest/lib2/src/main/res/drawable-ldpi/ic_launcher.png
+++ b/tests/libsTest/lib2/src/main/res/drawable-ldpi/ic_launcher.png
diff --git a/samples/libsTest/lib2/src/main/res/drawable-mdpi/ic_launcher.png b/tests/libsTest/lib2/src/main/res/drawable-mdpi/ic_launcher.png
index a07c69f..a07c69f 100644
--- a/samples/libsTest/lib2/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/tests/libsTest/lib2/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/samples/libsTest/lib2/src/main/res/layout/lib2_main.xml b/tests/libsTest/lib2/src/main/res/layout/lib2_main.xml
index bb639d1..bb639d1 100644
--- a/samples/libsTest/lib2/src/main/res/layout/lib2_main.xml
+++ b/tests/libsTest/lib2/src/main/res/layout/lib2_main.xml
diff --git a/samples/libsTest/lib2/src/main/res/values/strings.xml b/tests/libsTest/lib2/src/main/res/values/strings.xml
index 215b8fa..215b8fa 100644
--- a/samples/libsTest/lib2/src/main/res/values/strings.xml
+++ b/tests/libsTest/lib2/src/main/res/values/strings.xml
diff --git a/samples/libsTest/lib2/src/main/resources/com/android/tests/libstest/lib2/Lib2.txt b/tests/libsTest/lib2/src/main/resources/com/android/tests/libstest/lib2/Lib2.txt
index 94cabe4..94cabe4 100644
--- a/samples/libsTest/lib2/src/main/resources/com/android/tests/libstest/lib2/Lib2.txt
+++ b/tests/libsTest/lib2/src/main/resources/com/android/tests/libstest/lib2/Lib2.txt
diff --git a/samples/libsTest/lib2/src/test/java/com/android/tests/libstest/lib2/MainActivityTest.java b/tests/libsTest/lib2/src/test/java/com/android/tests/libstest/lib2/MainActivityTest.java
index 6ac4a5c..6ac4a5c 100644
--- a/samples/libsTest/lib2/src/test/java/com/android/tests/libstest/lib2/MainActivityTest.java
+++ b/tests/libsTest/lib2/src/test/java/com/android/tests/libstest/lib2/MainActivityTest.java
diff --git a/samples/libsTest/settings.gradle b/tests/libsTest/settings.gradle
index 1a602d2..1a602d2 100644
--- a/samples/libsTest/settings.gradle
+++ b/tests/libsTest/settings.gradle
diff --git a/samples/basic/src/main/AndroidManifest.xml b/tests/migrated/AndroidManifest.xml
index 4f8d570..4f8d570 100644
--- a/samples/basic/src/main/AndroidManifest.xml
+++ b/tests/migrated/AndroidManifest.xml
diff --git a/samples/basic/src/main/assets/notice.txt b/tests/migrated/assets/notice.txt
index 33ff961..33ff961 100644
--- a/samples/basic/src/main/assets/notice.txt
+++ b/tests/migrated/assets/notice.txt
diff --git a/samples/migrated/build.gradle b/tests/migrated/build.gradle
index 40e6d6b..40e6d6b 100644
--- a/samples/migrated/build.gradle
+++ b/tests/migrated/build.gradle
diff --git a/samples/libsTest/app/src/main/res/drawable-mdpi/icon.png b/tests/migrated/res/drawable/icon.png
index a07c69f..a07c69f 100644
--- a/samples/libsTest/app/src/main/res/drawable-mdpi/icon.png
+++ b/tests/migrated/res/drawable/icon.png
diff --git a/samples/basic/src/main/res/layout/main.xml b/tests/migrated/res/layout/main.xml
index b199751..b199751 100644
--- a/samples/basic/src/main/res/layout/main.xml
+++ b/tests/migrated/res/layout/main.xml
diff --git a/samples/basic/src/main/res/raw/notice.txt b/tests/migrated/res/raw/notice.txt
index 33ff961..33ff961 100644
--- a/samples/basic/src/main/res/raw/notice.txt
+++ b/tests/migrated/res/raw/notice.txt
diff --git a/samples/basic/src/main/res/values/strings.xml b/tests/migrated/res/values/strings.xml
index 60ea2d0..60ea2d0 100644
--- a/samples/basic/src/main/res/values/strings.xml
+++ b/tests/migrated/res/values/strings.xml
diff --git a/samples/basic/src/main/java/com/android/tests/basic/Main.java b/tests/migrated/src/com/android/tests/basic/Main.java
index 2b0e698..2b0e698 100644
--- a/samples/basic/src/main/java/com/android/tests/basic/Main.java
+++ b/tests/migrated/src/com/android/tests/basic/Main.java
diff --git a/samples/basic/src/test/java/com/android/tests/basic/MainTest.java b/tests/migrated/tests/src/com/android/tests/basic/MainTest.java
index 7cf7329..7cf7329 100644
--- a/samples/basic/src/test/java/com/android/tests/basic/MainTest.java
+++ b/tests/migrated/tests/src/com/android/tests/basic/MainTest.java
diff --git a/samples/multiproject/app/build.gradle b/tests/multiproject/app/build.gradle
index a8af53e..a8af53e 100644
--- a/samples/multiproject/app/build.gradle
+++ b/tests/multiproject/app/build.gradle
diff --git a/samples/multiproject/app/src/main/AndroidManifest.xml b/tests/multiproject/app/src/main/AndroidManifest.xml
index 71e7a47..71e7a47 100644
--- a/samples/multiproject/app/src/main/AndroidManifest.xml
+++ b/tests/multiproject/app/src/main/AndroidManifest.xml
diff --git a/samples/multiproject/app/src/main/java/com/example/android/multiproject/MainActivity.java b/tests/multiproject/app/src/main/java/com/example/android/multiproject/MainActivity.java
index 11d7c32..11d7c32 100644
--- a/samples/multiproject/app/src/main/java/com/example/android/multiproject/MainActivity.java
+++ b/tests/multiproject/app/src/main/java/com/example/android/multiproject/MainActivity.java
diff --git a/samples/multiproject/app/src/main/res/drawable-hdpi/ic_launcher.png b/tests/multiproject/app/src/main/res/drawable-hdpi/ic_launcher.png
index 96a442e..96a442e 100644
--- a/samples/multiproject/app/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/tests/multiproject/app/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/samples/multiproject/app/src/main/res/drawable-ldpi/ic_launcher.png b/tests/multiproject/app/src/main/res/drawable-ldpi/ic_launcher.png
index 9923872..9923872 100644
--- a/samples/multiproject/app/src/main/res/drawable-ldpi/ic_launcher.png
+++ b/tests/multiproject/app/src/main/res/drawable-ldpi/ic_launcher.png
diff --git a/samples/multiproject/app/src/main/res/drawable-mdpi/ic_launcher.png b/tests/multiproject/app/src/main/res/drawable-mdpi/ic_launcher.png
index 359047d..359047d 100644
--- a/samples/multiproject/app/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/tests/multiproject/app/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/samples/multiproject/app/src/main/res/drawable-xhdpi/ic_launcher.png b/tests/multiproject/app/src/main/res/drawable-xhdpi/ic_launcher.png
index 71c6d76..71c6d76 100644
--- a/samples/multiproject/app/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/tests/multiproject/app/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/samples/multiproject/app/src/main/res/layout/main.xml b/tests/multiproject/app/src/main/res/layout/main.xml
index ccc59fb..ccc59fb 100644
--- a/samples/multiproject/app/src/main/res/layout/main.xml
+++ b/tests/multiproject/app/src/main/res/layout/main.xml
diff --git a/samples/multiproject/app/src/main/res/values/strings.xml b/tests/multiproject/app/src/main/res/values/strings.xml
index e1f49b6..e1f49b6 100644
--- a/samples/multiproject/app/src/main/res/values/strings.xml
+++ b/tests/multiproject/app/src/main/res/values/strings.xml
diff --git a/samples/multiproject/baseLibrary/build.gradle b/tests/multiproject/baseLibrary/build.gradle
index f05d025..f05d025 100644
--- a/samples/multiproject/baseLibrary/build.gradle
+++ b/tests/multiproject/baseLibrary/build.gradle
diff --git a/samples/multiproject/baseLibrary/src/main/AndroidManifest.xml b/tests/multiproject/baseLibrary/src/main/AndroidManifest.xml
index 54d079c..54d079c 100644
--- a/samples/multiproject/baseLibrary/src/main/AndroidManifest.xml
+++ b/tests/multiproject/baseLibrary/src/main/AndroidManifest.xml
diff --git a/samples/multiproject/baseLibrary/src/main/java/com/sample/android/multiproject/library/PersonView.java b/tests/multiproject/baseLibrary/src/main/java/com/sample/android/multiproject/library/PersonView.java
index b218532..b218532 100644
--- a/samples/multiproject/baseLibrary/src/main/java/com/sample/android/multiproject/library/PersonView.java
+++ b/tests/multiproject/baseLibrary/src/main/java/com/sample/android/multiproject/library/PersonView.java
diff --git a/samples/multiproject/build.gradle b/tests/multiproject/build.gradle
index 157183f..157183f 100644
--- a/samples/multiproject/build.gradle
+++ b/tests/multiproject/build.gradle
diff --git a/samples/multiproject/library/build.gradle b/tests/multiproject/library/build.gradle
index a5f742c..a5f742c 100644
--- a/samples/multiproject/library/build.gradle
+++ b/tests/multiproject/library/build.gradle
diff --git a/samples/multiproject/library/src/main/AndroidManifest.xml b/tests/multiproject/library/src/main/AndroidManifest.xml
index 2bc9331..2bc9331 100644
--- a/samples/multiproject/library/src/main/AndroidManifest.xml
+++ b/tests/multiproject/library/src/main/AndroidManifest.xml
diff --git a/samples/multiproject/library/src/main/java/com/example/android/multiproject/library/ShowPeopleActivity.java b/tests/multiproject/library/src/main/java/com/example/android/multiproject/library/ShowPeopleActivity.java
index a3f2195..a3f2195 100644
--- a/samples/multiproject/library/src/main/java/com/example/android/multiproject/library/ShowPeopleActivity.java
+++ b/tests/multiproject/library/src/main/java/com/example/android/multiproject/library/ShowPeopleActivity.java
diff --git a/samples/multiproject/library/src/main/res/values/strings.xml b/tests/multiproject/library/src/main/res/values/strings.xml
index 45e9dbb..45e9dbb 100644
--- a/samples/multiproject/library/src/main/res/values/strings.xml
+++ b/tests/multiproject/library/src/main/res/values/strings.xml
diff --git a/samples/multiproject/settings.gradle b/tests/multiproject/settings.gradle
index 4ba4df5..4ba4df5 100644
--- a/samples/multiproject/settings.gradle
+++ b/tests/multiproject/settings.gradle
diff --git a/samples/multiproject/util/build.gradle b/tests/multiproject/util/build.gradle
index 0f2c256..0f2c256 100644
--- a/samples/multiproject/util/build.gradle
+++ b/tests/multiproject/util/build.gradle
diff --git a/samples/multiproject/util/src/main/java/com/example/android/multiproject/person/People.java b/tests/multiproject/util/src/main/java/com/example/android/multiproject/person/People.java
index 8b99248..8b99248 100644
--- a/samples/multiproject/util/src/main/java/com/example/android/multiproject/person/People.java
+++ b/tests/multiproject/util/src/main/java/com/example/android/multiproject/person/People.java
diff --git a/samples/multiproject/util/src/main/java/com/example/android/multiproject/person/Person.java b/tests/multiproject/util/src/main/java/com/example/android/multiproject/person/Person.java
index 2f4aa9f..2f4aa9f 100644
--- a/samples/multiproject/util/src/main/java/com/example/android/multiproject/person/Person.java
+++ b/tests/multiproject/util/src/main/java/com/example/android/multiproject/person/Person.java
diff --git a/samples/repo/.gitignore b/tests/repo/.gitignore
index 6971bfa..6971bfa 100644
--- a/samples/repo/.gitignore
+++ b/tests/repo/.gitignore
diff --git a/samples/repo/app/build.gradle b/tests/repo/app/build.gradle
index 2c0db45..2c0db45 100644
--- a/samples/repo/app/build.gradle
+++ b/tests/repo/app/build.gradle
diff --git a/samples/repo/app/src/main/AndroidManifest.xml b/tests/repo/app/src/main/AndroidManifest.xml
index 71e7a47..71e7a47 100644
--- a/samples/repo/app/src/main/AndroidManifest.xml
+++ b/tests/repo/app/src/main/AndroidManifest.xml
diff --git a/samples/repo/app/src/main/java/com/example/android/multiproject/MainActivity.java b/tests/repo/app/src/main/java/com/example/android/multiproject/MainActivity.java
index 11d7c32..11d7c32 100644
--- a/samples/repo/app/src/main/java/com/example/android/multiproject/MainActivity.java
+++ b/tests/repo/app/src/main/java/com/example/android/multiproject/MainActivity.java
diff --git a/samples/repo/app/src/main/res/drawable-hdpi/ic_launcher.png b/tests/repo/app/src/main/res/drawable-hdpi/ic_launcher.png
index 96a442e..96a442e 100644
--- a/samples/repo/app/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/tests/repo/app/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/samples/repo/app/src/main/res/drawable-ldpi/ic_launcher.png b/tests/repo/app/src/main/res/drawable-ldpi/ic_launcher.png
index 9923872..9923872 100644
--- a/samples/repo/app/src/main/res/drawable-ldpi/ic_launcher.png
+++ b/tests/repo/app/src/main/res/drawable-ldpi/ic_launcher.png
diff --git a/samples/repo/app/src/main/res/drawable-mdpi/ic_launcher.png b/tests/repo/app/src/main/res/drawable-mdpi/ic_launcher.png
index 359047d..359047d 100644
--- a/samples/repo/app/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/tests/repo/app/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/samples/repo/app/src/main/res/drawable-xhdpi/ic_launcher.png b/tests/repo/app/src/main/res/drawable-xhdpi/ic_launcher.png
index 71c6d76..71c6d76 100644
--- a/samples/repo/app/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/tests/repo/app/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/samples/repo/app/src/main/res/layout/main.xml b/tests/repo/app/src/main/res/layout/main.xml
index ccc59fb..ccc59fb 100644
--- a/samples/repo/app/src/main/res/layout/main.xml
+++ b/tests/repo/app/src/main/res/layout/main.xml
diff --git a/samples/repo/app/src/main/res/values/strings.xml b/tests/repo/app/src/main/res/values/strings.xml
index e1f49b6..e1f49b6 100644
--- a/samples/repo/app/src/main/res/values/strings.xml
+++ b/tests/repo/app/src/main/res/values/strings.xml
diff --git a/samples/repo/baseLibrary/build.gradle b/tests/repo/baseLibrary/build.gradle
index fc1a70a..fc1a70a 100644
--- a/samples/repo/baseLibrary/build.gradle
+++ b/tests/repo/baseLibrary/build.gradle
diff --git a/samples/repo/baseLibrary/src/main/AndroidManifest.xml b/tests/repo/baseLibrary/src/main/AndroidManifest.xml
index 54d079c..54d079c 100644
--- a/samples/repo/baseLibrary/src/main/AndroidManifest.xml
+++ b/tests/repo/baseLibrary/src/main/AndroidManifest.xml
diff --git a/samples/repo/baseLibrary/src/main/java/com/sample/android/multiproject/library/PersonView.java b/tests/repo/baseLibrary/src/main/java/com/sample/android/multiproject/library/PersonView.java
index b218532..b218532 100644
--- a/samples/repo/baseLibrary/src/main/java/com/sample/android/multiproject/library/PersonView.java
+++ b/tests/repo/baseLibrary/src/main/java/com/sample/android/multiproject/library/PersonView.java
diff --git a/samples/repo/library/build.gradle b/tests/repo/library/build.gradle
index 90ed7b6..90ed7b6 100644
--- a/samples/repo/library/build.gradle
+++ b/tests/repo/library/build.gradle
diff --git a/samples/repo/library/src/main/AndroidManifest.xml b/tests/repo/library/src/main/AndroidManifest.xml
index 2bc9331..2bc9331 100644
--- a/samples/repo/library/src/main/AndroidManifest.xml
+++ b/tests/repo/library/src/main/AndroidManifest.xml
diff --git a/samples/repo/library/src/main/java/com/example/android/multiproject/library/ShowPeopleActivity.java b/tests/repo/library/src/main/java/com/example/android/multiproject/library/ShowPeopleActivity.java
index a3f2195..a3f2195 100644
--- a/samples/repo/library/src/main/java/com/example/android/multiproject/library/ShowPeopleActivity.java
+++ b/tests/repo/library/src/main/java/com/example/android/multiproject/library/ShowPeopleActivity.java
diff --git a/samples/repo/library/src/main/res/values/strings.xml b/tests/repo/library/src/main/res/values/strings.xml
index 45e9dbb..45e9dbb 100644
--- a/samples/repo/library/src/main/res/values/strings.xml
+++ b/tests/repo/library/src/main/res/values/strings.xml
diff --git a/samples/repo/util/build.gradle b/tests/repo/util/build.gradle
index 9465ee3..9465ee3 100644
--- a/samples/repo/util/build.gradle
+++ b/tests/repo/util/build.gradle
diff --git a/samples/repo/util/src/main/java/com/example/android/multiproject/person/People.java b/tests/repo/util/src/main/java/com/example/android/multiproject/person/People.java
index 8b99248..8b99248 100644
--- a/samples/repo/util/src/main/java/com/example/android/multiproject/person/People.java
+++ b/tests/repo/util/src/main/java/com/example/android/multiproject/person/People.java
diff --git a/samples/repo/util/src/main/java/com/example/android/multiproject/person/Person.java b/tests/repo/util/src/main/java/com/example/android/multiproject/person/Person.java
index 2f4aa9f..2f4aa9f 100644
--- a/samples/repo/util/src/main/java/com/example/android/multiproject/person/Person.java
+++ b/tests/repo/util/src/main/java/com/example/android/multiproject/person/Person.java
diff --git a/samples/tictactoe/README.txt b/tests/tictactoe/README.txt
index 6a1ac65..6a1ac65 100644
--- a/samples/tictactoe/README.txt
+++ b/tests/tictactoe/README.txt
diff --git a/samples/tictactoe/app/build.gradle b/tests/tictactoe/app/build.gradle
index 3d4a6f5..3d4a6f5 100644
--- a/samples/tictactoe/app/build.gradle
+++ b/tests/tictactoe/app/build.gradle
diff --git a/samples/tictactoe/app/src/main/AndroidManifest.xml b/tests/tictactoe/app/src/main/AndroidManifest.xml
index e62c9ed..e62c9ed 100755
--- a/samples/tictactoe/app/src/main/AndroidManifest.xml
+++ b/tests/tictactoe/app/src/main/AndroidManifest.xml
diff --git a/samples/tictactoe/app/src/main/java/com/example/android/tictactoe/MainActivity.java b/tests/tictactoe/app/src/main/java/com/example/android/tictactoe/MainActivity.java
index 14a9011..14a9011 100755
--- a/samples/tictactoe/app/src/main/java/com/example/android/tictactoe/MainActivity.java
+++ b/tests/tictactoe/app/src/main/java/com/example/android/tictactoe/MainActivity.java
diff --git a/samples/tictactoe/app/src/main/res/drawable/icon.png b/tests/tictactoe/app/src/main/res/drawable/icon.png
index b8665ff..b8665ff 100755
--- a/samples/tictactoe/app/src/main/res/drawable/icon.png
+++ b/tests/tictactoe/app/src/main/res/drawable/icon.png
diff --git a/samples/tictactoe/app/src/main/res/layout/main.xml b/tests/tictactoe/app/src/main/res/layout/main.xml
index 1e75004..1e75004 100755
--- a/samples/tictactoe/app/src/main/res/layout/main.xml
+++ b/tests/tictactoe/app/src/main/res/layout/main.xml
diff --git a/samples/tictactoe/app/src/main/res/values/strings.xml b/tests/tictactoe/app/src/main/res/values/strings.xml
index 436877f..436877f 100755
--- a/samples/tictactoe/app/src/main/res/values/strings.xml
+++ b/tests/tictactoe/app/src/main/res/values/strings.xml
diff --git a/samples/tictactoe/build.gradle b/tests/tictactoe/build.gradle
index a0832c6..a0832c6 100644
--- a/samples/tictactoe/build.gradle
+++ b/tests/tictactoe/build.gradle
diff --git a/samples/tictactoe/lib/build.gradle b/tests/tictactoe/lib/build.gradle
index f7838fb..f7838fb 100644
--- a/samples/tictactoe/lib/build.gradle
+++ b/tests/tictactoe/lib/build.gradle
diff --git a/samples/tictactoe/lib/src/main/AndroidManifest.xml b/tests/tictactoe/lib/src/main/AndroidManifest.xml
index ee934a5..ee934a5 100755
--- a/samples/tictactoe/lib/src/main/AndroidManifest.xml
+++ b/tests/tictactoe/lib/src/main/AndroidManifest.xml
diff --git a/samples/tictactoe/lib/src/main/java/com/example/android/tictactoe/library/GameActivity.java b/tests/tictactoe/lib/src/main/java/com/example/android/tictactoe/library/GameActivity.java
index df1cac0..df1cac0 100755
--- a/samples/tictactoe/lib/src/main/java/com/example/android/tictactoe/library/GameActivity.java
+++ b/tests/tictactoe/lib/src/main/java/com/example/android/tictactoe/library/GameActivity.java
diff --git a/samples/tictactoe/lib/src/main/java/com/example/android/tictactoe/library/GameView.java b/tests/tictactoe/lib/src/main/java/com/example/android/tictactoe/library/GameView.java
index 3af516a..3af516a 100755
--- a/samples/tictactoe/lib/src/main/java/com/example/android/tictactoe/library/GameView.java
+++ b/tests/tictactoe/lib/src/main/java/com/example/android/tictactoe/library/GameView.java
diff --git a/samples/tictactoe/lib/src/main/res/drawable/lib_bg.9.png b/tests/tictactoe/lib/src/main/res/drawable/lib_bg.9.png
index 38c06c0..38c06c0 100755
--- a/samples/tictactoe/lib/src/main/res/drawable/lib_bg.9.png
+++ b/tests/tictactoe/lib/src/main/res/drawable/lib_bg.9.png
diff --git a/samples/tictactoe/lib/src/main/res/drawable/lib_circle.png b/tests/tictactoe/lib/src/main/res/drawable/lib_circle.png
index 55adffe..55adffe 100755
--- a/samples/tictactoe/lib/src/main/res/drawable/lib_circle.png
+++ b/tests/tictactoe/lib/src/main/res/drawable/lib_circle.png
diff --git a/samples/tictactoe/lib/src/main/res/drawable/lib_cross.png b/tests/tictactoe/lib/src/main/res/drawable/lib_cross.png
index 9189ebb..9189ebb 100755
--- a/samples/tictactoe/lib/src/main/res/drawable/lib_cross.png
+++ b/tests/tictactoe/lib/src/main/res/drawable/lib_cross.png
diff --git a/samples/tictactoe/lib/src/main/res/layout-land/lib_game.xml b/tests/tictactoe/lib/src/main/res/layout-land/lib_game.xml
index 9777e02..9777e02 100755
--- a/samples/tictactoe/lib/src/main/res/layout-land/lib_game.xml
+++ b/tests/tictactoe/lib/src/main/res/layout-land/lib_game.xml
diff --git a/samples/tictactoe/lib/src/main/res/layout/lib_game.xml b/tests/tictactoe/lib/src/main/res/layout/lib_game.xml
index 6735983..6735983 100755
--- a/samples/tictactoe/lib/src/main/res/layout/lib_game.xml
+++ b/tests/tictactoe/lib/src/main/res/layout/lib_game.xml
diff --git a/samples/tictactoe/lib/src/main/res/values/strings.xml b/tests/tictactoe/lib/src/main/res/values/strings.xml
index 468975a..468975a 100755
--- a/samples/tictactoe/lib/src/main/res/values/strings.xml
+++ b/tests/tictactoe/lib/src/main/res/values/strings.xml
diff --git a/samples/tictactoe/settings.gradle b/tests/tictactoe/settings.gradle
index 5ed7972..5ed7972 100644
--- a/samples/tictactoe/settings.gradle
+++ b/tests/tictactoe/settings.gradle