Merge "Add the resValue output folder to the model." into studio-1.0-dev
diff --git a/build-system/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java b/build-system/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java
index 923ed4d..a10a0aa 100644
--- a/build-system/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java
+++ b/build-system/gradle-model/src/test/java/com/android/build/gradle/model/AndroidProjectTest.java
@@ -399,6 +399,11 @@
assertEquals("Test sourceGenTask", "generateDebugTestSources", debugTestInfo.getSourceGenTaskName());
assertEquals("Test compileTask", "compileDebugTestSources", debugTestInfo.getCompileTaskName());
+ Collection<File> generatedResFolders = debugTestInfo.getGeneratedResourceFolders();
+ assertNotNull(generatedResFolders);
+ // size 2 = rs output + resValue output
+ assertEquals(2, generatedResFolders.size());
+
Collection<AndroidArtifactOutput> debugTestOutputs = debugTestInfo.getOutputs();
assertNotNull("Debug test output null-check", debugTestOutputs);
assertEquals("Debug test output size", 1, debugTestOutputs.size());
diff --git a/build-system/gradle/src/main/groovy/com/android/build/gradle/internal/model/ModelBuilder.groovy b/build-system/gradle/src/main/groovy/com/android/build/gradle/internal/model/ModelBuilder.groovy
index 7c2b1c5..f98e230 100644
--- a/build-system/gradle/src/main/groovy/com/android/build/gradle/internal/model/ModelBuilder.groovy
+++ b/build-system/gradle/src/main/groovy/com/android/build/gradle/internal/model/ModelBuilder.groovy
@@ -329,7 +329,9 @@
return Collections.emptyList()
}
- return Collections.singletonList(variantData.renderscriptCompileTask.resOutputDir)
+ return Lists.asList(
+ variantData.renderscriptCompileTask.resOutputDir,
+ variantData.generateResValuesTask.resOutputDir)
}
@NonNull
