diff options
| author |  cparsons <cparsons@google.com> | 2018-03-28 08:51:32 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-03-28 08:53:10 -0700 |
| commit | f6d2881825f8b42331263abfa47da9ebe5f951ba (patch) | |
| tree | e0d6ee28af39489e3a865ced2a7dc1f7dd60ca13 /src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java | |
| parent | 3a61eb654b2ee4da0a1a749ec48adbc06aa42aee (diff) | |
Make deprecated ObjcProvider fields return empty sets when --incompatible_disable_objc_provider_resources is true.
This involves propagating SkylarkSemantics to all ObjcProvider constructors.
RELNOTES: Introduce --incompatible_disable_objc_provider_resources to turn off all resource-related fields of the Objc provider.
PiperOrigin-RevId: 190778491
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java index 83a35b91bf..b761f53fdc 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java @@ -47,7 +47,7 @@ public class J2ObjcLibrary implements RuleConfiguredTargetFactory { public static final ImmutableList<String> J2OBJC_SUPPORTED_RULES = ImmutableList.of("java_import", "java_library", "proto_library"); - private ObjcCommon common(RuleContext ruleContext) { + private ObjcCommon common(RuleContext ruleContext) throws InterruptedException { return new ObjcCommon.Builder(ruleContext) .setCompilationAttributes( CompilationAttributes.Builder.fromRuleContext(ruleContext).build()) @@ -75,7 +75,7 @@ public class J2ObjcLibrary implements RuleConfiguredTargetFactory { Iterable<ObjcProvider> jreDeps = ruleContext.getPrerequisites("jre_deps", Mode.TARGET, ObjcProvider.SKYLARK_CONSTRUCTOR); ObjcProvider.Builder objcProviderBuilder = - new ObjcProvider.Builder() + new ObjcProvider.Builder(ruleContext.getAnalysisEnvironment().getSkylarkSemantics()) .addTransitiveAndPropagate(jreDeps) .addTransitiveAndPropagate( ruleContext.getPrerequisites( |