1 files changed, 8 insertions, 0 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 16f6ff3..37502bc 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
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 package com.android.build.gradle.tasks
+
+import com.android.build.gradle.LibraryPlugin
 import com.android.build.gradle.internal.tasks.IncrementalTask
 import com.android.ide.common.res2.FileStatus
 import com.android.ide.common.res2.FileValidity
@@ -75,6 +77,12 @@ public class MergeResources extends IncrementalTask {
             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)
+            }
+
             merger.mergeData(writer, false /*doCleanUp*/)
 
             // No exception? Write the known state.