Merge "Allow for easier relocation of full sourcesets."

2 files changed, 13 insertions, 9 deletions

diff --git a/tests/migrated/build.gradle b/tests/migrated/build.gradle
index 40e6d6b..fd8ca17 100644
--- a/tests/migrated/build.gradle
+++ b/tests/migrated/build.gradle
@@ -17,28 +17,32 @@ android {
     sourceSets {
         main {
             manifest {
+                // there's only ever one file so srcFile replaces it.
                 srcFile 'AndroidManifest.xml'
             }
             java {
-                srcDir 'src'
+                // writing:
+                //    srcDir 'src'
+                // would *add* to the default folder so we use a different syntax
+                srcDirs = ['src']
                 exclude 'some/unwanted/package/**'
             }
             res {
-                srcDir 'res'
+                srcDirs = ['res']
             }
             assets {
-                srcDir 'assets'
+                srcDirs = ['assets']
             }
             resources {
-                srcDir 'src'
-            }
-        }
-        test {
-            java {
-                srcDir 'tests/src'
+                srcDirs = ['src']
             }
         }
 
+        // this moves src/test to tests so all folders follow:
+        // tests/java, tests/res, tests/assets, ...
+        // This is a *reset* so it replaces the default paths
+        test.setRoot('tests')
+
         // Could also be done with:
         //main.manifest.srcFile 'AndroidManifest.xml'
         //main.java.srcDir 'src'
diff --git a/tests/migrated/tests/src/com/android/tests/basic/MainTest.java b/tests/migrated/tests/java/com/android/tests/basic/MainTest.java
index 7cf7329..7cf7329 100644
--- a/tests/migrated/tests/src/com/android/tests/basic/MainTest.java
+++ b/tests/migrated/tests/java/com/android/tests/basic/MainTest.java