diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-12-04 02:12:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-04 02:12:59 +0000 |
| commit | c618bf644e0a6fdcddf0c7b1f728ac20a5fc7993 (patch) | |
| tree | 110dc61f313fc9e236d24fdea316d042029e35ee /gradle | |
| parent | 7a05a1b055d6c1f18d592415230ea54bc7e56860 (diff) | |
| parent | 065947cd93481255143c154bd8188c42d5f87700 (diff) | |
| download | build-c618bf644e0a6fdcddf0c7b1f728ac20a5fc7993.tar.gz | |
Merge "Include source markers in library merged resource files for now"
Diffstat (limited to 'gradle')
| -rw-r--r-- | gradle/src/main/groovy/com/android/build/gradle/tasks/MergeResources.groovy | 8 |
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) |