diff options
| author |  Googler <noreply@google.com> | 2018-02-01 15:19:31 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-01 15:22:40 -0800 |
| commit | 3b760aff0f617607af1b2c0672ad89bc37e96421 (patch) | |
| tree | e52b498d2ae2637059b00c24caff6fb894065e45 /src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java | |
| parent | bee7f365470fb3d98937948e1ecd6ad66d434a5c (diff) | |
PiperOrigin-RevId: 184203570
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.java | 9 |
1 files changed, 5 insertions, 4 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 e9064e9400..f6357eaee3 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 @@ -743,6 +743,8 @@ public class AndroidCommon { .setNeverlink(isNeverlink) .build(); + AndroidResourcesInfo resourceInfo = resourceApk.toResourceInfo(ruleContext.getLabel()); + return builder .setFilesToBuild(filesToBuild) .addSkylarkTransitiveInfo( @@ -752,9 +754,7 @@ public class AndroidCommon { JavaRuntimeJarProvider.class, new JavaRuntimeJarProvider(javaCommon.getJavaCompilationArtifacts().getRuntimeJars())) .addProvider(RunfilesProvider.class, RunfilesProvider.simple(getRunfiles())) - .addProvider( - AndroidResourcesProvider.class, - resourceApk.toResourceProvider(ruleContext.getLabel())) + .addNativeDeclaredProvider(resourceInfo) .addProvider( AndroidIdeInfoProvider.class, createAndroidIdeInfoProvider( @@ -766,7 +766,8 @@ public class AndroidCommon { zipAlignedApk, apksUnderTest, nativeLibs)) - .addSkylarkTransitiveInfo(AndroidSkylarkApiProvider.NAME, new AndroidSkylarkApiProvider()) + .addSkylarkTransitiveInfo( + AndroidSkylarkApiProvider.NAME, new AndroidSkylarkApiProvider(resourceInfo)) .addOutputGroup( OutputGroupInfo.HIDDEN_TOP_LEVEL, collectHiddenTopLevelArtifacts(ruleContext)) .addOutputGroup( |