From f9e7529908149e0511cc666c8fed879a50dbaea8 Mon Sep 17 00:00:00 2001
From: asteinb <asteinb@google.com>
Date: Thu, 10 May 2018 10:28:10 -0700
Subject: 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
---
 .../com/google/devtools/build/lib/rules/android/AndroidCommon.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java')

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)
-- 
cgit v1.2.3