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/AppleStaticLibrary.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/AppleStaticLibrary.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java index 98b764baff..30f6c1e428 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java @@ -102,7 +102,8 @@ public class AppleStaticLibrary implements RuleConfiguredTargetFactory { NestedSetBuilder.<Artifact>stableOrder() .add(ruleIntermediateArtifacts.combinedArchitectureArchive()); - ObjcProvider.Builder objcProviderBuilder = new ObjcProvider.Builder(); + ObjcProvider.Builder objcProviderBuilder = + new ObjcProvider.Builder(ruleContext.getAnalysisEnvironment().getSkylarkSemantics()); ImmutableListMultimap<BuildConfiguration, ObjcProtoProvider> objcProtoProvidersMap = ruleContext.getPrerequisitesByConfiguration("deps", Mode.SPLIT, @@ -209,7 +210,7 @@ public class AppleStaticLibrary implements RuleConfiguredTargetFactory { BuildConfiguration buildConfiguration, IntermediateArtifacts intermediateArtifacts, List<ConfiguredTargetAndData> propagatedConfigredTargetAndTargetDeps, - Optional<ObjcProvider> protosObjcProvider) { + Optional<ObjcProvider> protosObjcProvider) throws InterruptedException { CompilationArtifacts compilationArtifacts = new CompilationArtifacts.Builder().build(); |