Remove the default java tasks and fix packaging java res
authorXavier Ducrohet <xav@android.com>
Fri, 21 Sep 2012 23:39:16 +0000 (16:39 -0700)
committerXavier Ducrohet <xav@android.com>
Sat, 22 Sep 2012 02:08:20 +0000 (19:08 -0700)
commita53003c3a49cb38ad8a60e5966cbc556f3086a31
tree6406f87e453fe71f80bfae64be3ff1645a0a86ea
parent88575aa7279736965108f0f77f571156b4decf4d
Remove the default java tasks and fix packaging java res

Until we use custom source set more adapted to our needs,
we delete the default java tasks after each source set is created.

This also fixes the packaging of java resources. Right now
this reads directly from the source folder, instead of copying
to a build folder based on a configurable source set. This should
be fixed once we use our own source set.

Also fixed packaging java resources from jars and libraries
which was missing. This led me to clean up a bit how
we handle library deps (especially related to test projects
for libraries) and fixed an issue related to merging manifests.

Change-Id: I0cc7fb833c2319da501cb92258be7d79b1c3771b
builder/src/main/java/com/android/builder/AndroidBuilder.java
builder/src/main/java/com/android/builder/VariantConfiguration.java
gradle/src/main/groovy/com/android/build/gradle/AndroidBasePlugin.groovy
gradle/src/main/groovy/com/android/build/gradle/AndroidLibraryPlugin.groovy
gradle/src/main/groovy/com/android/build/gradle/AndroidPlugin.groovy
testapps/libsTest/app/src/main/resources/com/android/tests/libstest/app/App.txt [moved from testapps/libsTest/app/src/main/java/com/android/tests/libstest/app/App.txt with 100% similarity]
testapps/libsTest/lib1/src/main/resources/com/android/tests/libstest/lib1/Lib1.txt [moved from testapps/libsTest/lib1/src/main/java/com/android/tests/libstest/lib1/Lib1.txt with 100% similarity]
testapps/libsTest/lib2/src/main/resources/com/android/tests/libstest/lib2/Lib2.txt [moved from testapps/libsTest/lib2/src/main/java/com/android/tests/libstest/lib2/Lib2.txt with 100% similarity]