diff options
Diffstat (limited to 'gradle/src')
| -rw-r--r-- | gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy | 3 | ||||
| -rw-r--r-- | gradle/src/main/groovy/com/android/build/gradle/tasks/MergeResources.groovy | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy index f3d3fbe..b407228 100644 --- a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy +++ b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy @@ -327,6 +327,9 @@ public abstract class BasePlugin { if (androidBuilder == null) { SdkParser parser = getLoadedSdkParser() androidBuilder = new AndroidBuilder(parser, creator, logger, verbose) + if (this instanceof LibraryPlugin) { + androidBuilder.setBuildingLibrary(true); + } builders.put(variantData, androidBuilder) } 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. |