diff options
author | Xavier Ducrohet <xav@android.com> | 2013-01-10 16:47:30 -0800 |
---|---|---|
committer | Xavier Ducrohet <xav@android.com> | 2013-01-11 16:25:33 -0800 |
commit | 44c6ab1a2be57477ff80fbb2a3358922a53752a7 (patch) | |
tree | e36fb74beb689917ac96f070b7f36fe8c9acfe78 /tests/migrated | |
parent | 1ac02d56be392643eb31a855fb418cfa926b63f8 (diff) | |
download | build-44c6ab1a2be57477ff80fbb2a3358922a53752a7.tar.gz |
Allow for easier relocation of full sourcesets.
You can now call
android.sourceSets.test.resetToRoot("blah/test")
and it will move all of src/test/* to blah/test/*
It makes it easier to migrate older project by relocating
non src/main outside of src/
Updated the 'migrated' samples to reflect this + other
misc fixes.
Change-Id: I2b98ada80a9b8d564370e00e3ed63a3d68c60412
Diffstat (limited to 'tests/migrated')
-rw-r--r-- | tests/migrated/build.gradle | 22 | ||||
-rw-r--r-- | tests/migrated/tests/java/com/android/tests/basic/MainTest.java (renamed from tests/migrated/tests/src/com/android/tests/basic/MainTest.java) | 0 |
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 |