aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
diff options
context:
space:
mode:
authorGravatar asteinb <asteinb@google.com>2018-05-10 10:28:10 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-05-10 10:30:13 -0700
commitf9e7529908149e0511cc666c8fed879a50dbaea8 (patch)
treec3d5f2a45dca5723e66a601d7c22cbe2e073b538 /src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
parent494161c52c886c198f8d71b22896923ea536aa3d (diff)
Create top-level android data provider
This provider wraps the other android data providers, as well as artifacts that should only be made available for top-level Android targets. This provider is required for some output (such as final data APK) to be exposed to Skylark, and also makes it easy to pass information from android_binary data processing to postprocessing actions, most notably resource shrinking (next reviews). RELNOTES: none PiperOrigin-RevId: 196135042
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
index fe539531ea..42147be658 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
@@ -662,7 +662,8 @@ public class AndroidCommon {
Artifact zipAlignedApk,
Iterable<Artifact> apksUnderTest,
NativeLibs nativeLibs,
- boolean isNeverlink) {
+ boolean isNeverlink,
+ boolean isLibrary) {
idlHelper.addTransitiveInfoProviders(builder, classJar, manifestProtoOutput);
@@ -708,7 +709,7 @@ public class AndroidCommon {
.build();
resourceApk.addToConfiguredTargetBuilder(
- builder, ruleContext.getLabel(), /* includeSkylarkApiProvider = */ true);
+ builder, ruleContext.getLabel(), /* includeSkylarkApiProvider = */ true, isLibrary);
return builder
.setFilesToBuild(filesToBuild)