diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc')
7 files changed, 21 insertions, 21 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java index be2a83943d..4150d8ec52 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java @@ -48,7 +48,7 @@ import com.google.devtools.build.lib.rules.cpp.CcToolchainProvider; import com.google.devtools.build.lib.rules.objc.AppleDebugOutputsInfo.OutputType; import com.google.devtools.build.lib.rules.objc.CompilationSupport.ExtraLinkArgs; import com.google.devtools.build.lib.rules.objc.MultiArchBinarySupport.DependencySpecificConfiguration; -import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget; +import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData; import java.util.Map; import java.util.TreeMap; @@ -144,7 +144,7 @@ public class AppleBinary implements RuleConfiguredTargetFactory { "non_propagated_deps", Mode.SPLIT, ObjcProvider.SKYLARK_CONSTRUCTOR); ImmutableListMultimap<BuildConfiguration, TransitiveInfoCollection> configToDepsCollectionMap = ruleContext.getPrerequisitesByConfiguration("deps", Mode.SPLIT); - ImmutableListMultimap<BuildConfiguration, ConfiguredTargetAndTarget> + ImmutableListMultimap<BuildConfiguration, ConfiguredTargetAndData> configToCTATDepsCollectionMap = ruleContext.getPrerequisiteCofiguredTargetAndTargetsByConfiguration("deps", Mode.SPLIT); 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 ab1f93e049..98b764baff 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 @@ -38,7 +38,7 @@ import com.google.devtools.build.lib.rules.cpp.CcToolchainProvider; import com.google.devtools.build.lib.rules.cpp.CppHelper; import com.google.devtools.build.lib.rules.objc.ObjcProvider.Key; import com.google.devtools.build.lib.rules.proto.ProtoSourcesProvider; -import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget; +import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -76,7 +76,7 @@ public class AppleStaticLibrary implements RuleConfiguredTargetFactory { MultiArchSplitTransitionProvider.validateMinimumOs(ruleContext); PlatformType platformType = MultiArchSplitTransitionProvider.getPlatformType(ruleContext); - ImmutableListMultimap<BuildConfiguration, ConfiguredTargetAndTarget> + ImmutableListMultimap<BuildConfiguration, ConfiguredTargetAndData> configToCTATDepsCollectionMap = ruleContext.getPrerequisiteCofiguredTargetAndTargetsByConfiguration("deps", Mode.SPLIT); ImmutableListMultimap<BuildConfiguration, ObjcProvider> configToObjcAvoidDepsMap = @@ -208,7 +208,7 @@ public class AppleStaticLibrary implements RuleConfiguredTargetFactory { RuleContext ruleContext, BuildConfiguration buildConfiguration, IntermediateArtifacts intermediateArtifacts, - List<ConfiguredTargetAndTarget> propagatedConfigredTargetAndTargetDeps, + List<ConfiguredTargetAndData> propagatedConfigredTargetAndTargetDeps, Optional<ObjcProvider> protosObjcProvider) { CompilationArtifacts compilationArtifacts = new CompilationArtifacts.Builder().build(); diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java index 06759dcfe5..5a65d0b48e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java @@ -72,7 +72,7 @@ import com.google.devtools.build.lib.rules.proto.ProtoSourceFileBlacklist; import com.google.devtools.build.lib.rules.proto.ProtoSourcesProvider; import com.google.devtools.build.lib.rules.proto.ProtoSupportDataProvider; import com.google.devtools.build.lib.rules.proto.SupportData; -import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget; +import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData; import com.google.devtools.build.lib.util.FileType; import com.google.devtools.build.lib.vfs.PathFragment; import java.util.List; @@ -225,9 +225,9 @@ public class J2ObjcAspect extends NativeAspectClass implements ConfiguredAspectF @Override public ConfiguredAspect create( - ConfiguredTargetAndTarget ctatBase, RuleContext ruleContext, AspectParameters parameters) + ConfiguredTargetAndData ctadBase, RuleContext ruleContext, AspectParameters parameters) throws InterruptedException { - ConfiguredTarget base = ctatBase.getConfiguredTarget(); + ConfiguredTarget base = ctadBase.getConfiguredTarget(); if (isProtoRule(base)) { if (shouldAttachToProtoRule(ruleContext)) { return proto(base, ruleContext, parameters); diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchBinarySupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchBinarySupport.java index 372412f4b2..fa1662265d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchBinarySupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchBinarySupport.java @@ -39,7 +39,7 @@ import com.google.devtools.build.lib.rules.cpp.CcLinkParamsInfo; import com.google.devtools.build.lib.rules.cpp.CcToolchainProvider; import com.google.devtools.build.lib.rules.objc.CompilationSupport.ExtraLinkArgs; import com.google.devtools.build.lib.rules.proto.ProtoSourcesProvider; -import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget; +import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData; import java.util.List; import java.util.Map; import java.util.Set; @@ -211,7 +211,7 @@ public class MultiArchBinarySupport { public ImmutableSet<DependencySpecificConfiguration> getDependencySpecificConfigurations( Map<BuildConfiguration, CcToolchainProvider> childConfigurationsAndToolchains, ImmutableListMultimap<BuildConfiguration, TransitiveInfoCollection> configToDepsCollectionMap, - ImmutableListMultimap<BuildConfiguration, ConfiguredTargetAndTarget> + ImmutableListMultimap<BuildConfiguration, ConfiguredTargetAndData> configToCTATDepsCollectionMap, ImmutableListMultimap<BuildConfiguration, ObjcProvider> configurationToNonPropagatedObjcMap, Iterable<TransitiveInfoCollection> dylibProviders) @@ -299,7 +299,7 @@ public class MultiArchBinarySupport { RuleContext ruleContext, BuildConfiguration buildConfiguration, IntermediateArtifacts intermediateArtifacts, - List<ConfiguredTargetAndTarget> propagatedConfiguredTargetAndTargetDeps, + List<ConfiguredTargetAndData> propagatedConfiguredTargetAndDataDeps, List<ObjcProvider> nonPropagatedObjcDeps, Iterable<ObjcProvider> additionalDepProviders) { @@ -307,7 +307,7 @@ public class MultiArchBinarySupport { new ObjcCommon.Builder(ruleContext, buildConfiguration) .setCompilationAttributes( CompilationAttributes.Builder.fromRuleContext(ruleContext).build()) - .addDeps(propagatedConfiguredTargetAndTargetDeps) + .addDeps(propagatedConfiguredTargetAndDataDeps) .addDepObjcProviders(additionalDepProviders) .addNonPropagatedDepObjcProviders(nonPropagatedObjcDeps) .setIntermediateArtifacts(intermediateArtifacts) diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java index fbfa23e121..bb20db497c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java @@ -72,7 +72,7 @@ import com.google.devtools.build.lib.rules.cpp.CcLinkParams; import com.google.devtools.build.lib.rules.cpp.CcLinkParamsInfo; import com.google.devtools.build.lib.rules.cpp.CppFileTypes; import com.google.devtools.build.lib.rules.cpp.CppModuleMap; -import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget; +import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData; import com.google.devtools.build.lib.util.FileType; import com.google.devtools.build.lib.util.FileTypeSet; import com.google.devtools.build.lib.vfs.PathFragment; @@ -249,14 +249,14 @@ public final class ObjcCommon { return this; } - Builder addDeps(List<ConfiguredTargetAndTarget> deps) { + Builder addDeps(List<ConfiguredTargetAndData> deps) { ImmutableList.Builder<ObjcProvider> propagatedObjcDeps = ImmutableList.<ObjcProvider>builder(); ImmutableList.Builder<CcCompilationInfo> cppDeps = ImmutableList.<CcCompilationInfo>builder(); ImmutableList.Builder<CcLinkParamsInfo> cppDepLinkParams = ImmutableList.<CcLinkParamsInfo>builder(); - for (ConfiguredTargetAndTarget dep : deps) { + for (ConfiguredTargetAndData dep : deps) { ConfiguredTarget depCT = dep.getConfiguredTarget(); addAnyProviders(propagatedObjcDeps, depCT, ObjcProvider.SKYLARK_CONSTRUCTOR); addAnyProviders(cppDeps, depCT, CcCompilationInfo.PROVIDER); @@ -567,7 +567,7 @@ public final class ObjcCommon { return new ObjcCommon(objcProvider.build(), compilationArtifacts); } - private static boolean isCcLibrary(ConfiguredTargetAndTarget info) { + private static boolean isCcLibrary(ConfiguredTargetAndData info) { try { String targetName = info.getTarget().getTargetKind(); diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoAspect.java index 010f2bcca3..279f19ec73 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoAspect.java @@ -29,7 +29,7 @@ import com.google.devtools.build.lib.packages.AspectParameters; import com.google.devtools.build.lib.packages.BuildType; import com.google.devtools.build.lib.packages.SkylarkNativeAspect; import com.google.devtools.build.lib.rules.proto.ProtoSourcesProvider; -import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget; +import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData; /** * Aspect that gathers the proto dependencies of the attached rule target, and propagates the proto @@ -47,7 +47,7 @@ public class ObjcProtoAspect extends SkylarkNativeAspect implements ConfiguredAs @Override public ConfiguredAspect create( - ConfiguredTargetAndTarget ctatBase, RuleContext ruleContext, AspectParameters parameters) + ConfiguredTargetAndData ctadBase, RuleContext ruleContext, AspectParameters parameters) throws InterruptedException { ConfiguredAspect.Builder aspectBuilder = new ConfiguredAspect.Builder( this, parameters, ruleContext); diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoAttributes.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoAttributes.java index 6add80c7df..8552434635 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoAttributes.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoAttributes.java @@ -30,7 +30,7 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; import com.google.devtools.build.lib.rules.proto.ProtoSourceFileBlacklist; import com.google.devtools.build.lib.rules.proto.ProtoSourcesProvider; -import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget; +import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData; import java.util.ArrayList; /** Common rule attributes used by an objc_proto_library. */ @@ -91,7 +91,7 @@ final class ProtoAttributes { return ruleContext.attributes().has(ObjcProtoLibraryRule.PORTABLE_PROTO_FILTERS_ATTR); } - private boolean isObjcProtoLibrary(ConfiguredTargetAndTarget dependency) { + private boolean isObjcProtoLibrary(ConfiguredTargetAndData dependency) { try { String targetName = dependency.getTarget().getTargetKind(); return targetName.equals("objc_proto_library rule"); @@ -247,7 +247,7 @@ final class ProtoAttributes { } private boolean hasObjcProtoLibraryDependencies() { - for (ConfiguredTargetAndTarget dep : + for (ConfiguredTargetAndData dep : ruleContext.getPrerequisiteConfiguredTargetAndTargets("deps", Mode.TARGET)) { if (isObjcProtoLibrary(dep)) { return true; |