Include source markers in library merged resource files for now

We should only suppress source markers in libraries during release builds.
We don't have this info quite yet, so for now, stub it out.

Change-Id: If09acffccec529548efbf1d3f5ea88a3a286f171

1 files changed, 2 insertions, 6 deletions

diff --git a/gradle/src/main/groovy/com/android/build/gradle/tasks/MergeResources.groovy b/gradle/src/main/groovy/com/android/build/gradle/tasks/MergeResources.groovy
index 37502bc..b6487df 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/tasks/MergeResources.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/tasks/MergeResources.groovy
@@ -76,12 +76,7 @@ public class MergeResources extends IncrementalTask {
             // get the merged set and write it down.
             MergedResourceWriter writer = new MergedResourceWriter(
                     destinationDir, getProcess9Patch() ? builder.aaptRunner : null)
-
-            // Don't put source markers in libraries since clients of the AAR will
-            // not have access to these (and it leaks build server paths etc to users)
-            if (plugin instanceof LibraryPlugin) {
-                writer.setInsertSourceMarkers(false)
-            }
+            writer.setInsertSourceMarkers(builder.isInsertSourceMarkers())
 
             merger.mergeData(writer, false /*doCleanUp*/)
 
@@ -140,6 +135,7 @@ public class MergeResources extends IncrementalTask {
 
             MergedResourceWriter writer = new MergedResourceWriter(
                     getOutputDir(), getProcess9Patch() ? builder.aaptRunner : null)
+            writer.setInsertSourceMarkers(builder.isInsertSourceMarkers())
             merger.mergeData(writer, false /*doCleanUp*/)
             // No exception? Write the known state.
             merger.writeBlobTo(getIncrementalFolder(), writer)