diff options
| author |  Googler <noreply@google.com> | 2018-08-08 10:20:08 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-08-08 10:21:46 -0700 |
| commit | 0f232691719ef89a0a1c7be631a84f435894a6ce (patch) | |
| tree | 59148119a6d4ed3b72c9ccf79e9add7a02b7aeb0 /src/main/java/com/google/devtools/build/lib/rules/android | |
| parent | bf1db78d75ac6d2fe40742c36f79341859274f50 (diff) | |
Expose GeneratedExtensionRegistryProvider to Skylark.
RELNOTES: None
PiperOrigin-RevId: 207905848
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java | 3 |
2 files changed, 2 insertions, 3 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 9466d7060a..e18857f31e 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 @@ -678,7 +678,7 @@ public class AndroidCommon { idlHelper.addTransitiveInfoProviders(builder, classJar, manifestProtoOutput); if (generatedExtensionRegistryProvider != null) { - builder.add(GeneratedExtensionRegistryProvider.class, generatedExtensionRegistryProvider); + builder.addNativeDeclaredProvider(generatedExtensionRegistryProvider); } OutputJar resourceJar = null; if (resourceApk.getResourceJavaClassJar() != null && resourceSourceJar != null) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java index 5700cf35d0..b484479169 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java @@ -324,8 +324,7 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor RuleConfiguredTargetBuilder builder = new RuleConfiguredTargetBuilder(ruleContext); if (generatedExtensionRegistryProvider != null) { - builder.addProvider( - GeneratedExtensionRegistryProvider.class, generatedExtensionRegistryProvider); + builder.addNativeDeclaredProvider(generatedExtensionRegistryProvider); } JavaRuleOutputJarsProvider ruleOutputJarsProvider = javaRuleOutputJarsProviderBuilder.build(); |