Skip to content

Commit 092884b

Browse files
Googlercopybara-github
Googler
authored and
copybara-github
committed
Remove the orphaned AppleDylibBinary and AppleLoadableBundleBinary providers.
At one time, these were part of the implementation of the apple_binary rule, but the rules_apple equivalent no longer relies on these. PiperOrigin-RevId: 443132305
1 parent 6fcbecb commit 092884b

File tree

7 files changed

+0
-292
lines changed

7 files changed

+0
-292
lines changed

‎src/main/java/com/google/devtools/build/lib/rules/objc/AppleDylibBinaryInfo.java‎

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎src/main/java/com/google/devtools/build/lib/rules/objc/AppleLoadableBundleBinaryInfo.java‎

Lines changed: 0 additions & 79 deletions
This file was deleted.

‎src/main/java/com/google/devtools/build/lib/rules/objc/AppleStarlarkCommon.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,6 @@ public Provider getAppleDynamicFrameworkConstructor() {
144144
return AppleDynamicFrameworkInfo.STARLARK_CONSTRUCTOR;
145145
}
146146

147-
@Override
148-
public Provider getAppleDylibBinaryConstructor() {
149-
return AppleDylibBinaryInfo.STARLARK_CONSTRUCTOR;
150-
}
151-
152147
@Override
153148
public Provider getAppleExecutableBinaryConstructor() {
154149
return AppleExecutableBinaryInfo.STARLARK_CONSTRUCTOR;
@@ -164,11 +159,6 @@ public Provider getAppleDebugOutputsConstructor() {
164159
return AppleDebugOutputsInfo.STARLARK_CONSTRUCTOR;
165160
}
166161

167-
@Override
168-
public Provider getAppleLoadableBundleBinaryConstructor() {
169-
return AppleLoadableBundleBinaryInfo.STARLARK_CONSTRUCTOR;
170-
}
171-
172162
@Override
173163
public ImmutableMap<String, String> getAppleHostSystemEnv(XcodeConfigInfo xcodeConfig) {
174164
return AppleConfiguration.getXcodeVersionEnv(xcodeConfig.getXcodeVersion());

‎src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/AppleCommonApi.java‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -142,18 +142,6 @@ public interface AppleCommonApi<
142142
structField = true)
143143
ProviderApi getAppleDynamicFrameworkConstructor();
144144

145-
@StarlarkMethod(
146-
name = "AppleDylibBinary",
147-
doc =
148-
"The constructor/key for the <code>AppleDylibBinary</code> provider.<p>If a target"
149-
+ " propagates the <code>AppleDylibBinary</code> provider, use this as the key with"
150-
+ " which to retrieve it. Example:<br><pre class='language-python'>\n"
151-
+ "dep = ctx.attr.deps[0]\n"
152-
+ "p = dep[apple_common.AppleDylibBinary]\n"
153-
+ "</pre>",
154-
structField = true)
155-
ProviderApi getAppleDylibBinaryConstructor();
156-
157145
@StarlarkMethod(
158146
name = "AppleExecutableBinary",
159147
doc =
@@ -192,19 +180,6 @@ public interface AppleCommonApi<
192180
structField = true)
193181
ProviderApi getAppleDebugOutputsConstructor();
194182

195-
@StarlarkMethod(
196-
name = "AppleLoadableBundleBinary",
197-
doc =
198-
"The constructor/key for the <code>AppleLoadableBundleBinary</code> provider.<p>"
199-
+ "If a target propagates the <code>AppleLoadableBundleBinary</code> provider, "
200-
+ "use this as the key with which to retrieve it. Example:<br>"
201-
+ "<pre class='language-python'>\n"
202-
+ "dep = ctx.attr.deps[0]\n"
203-
+ "p = dep[apple_common.AppleLoadableBundleBinary]\n"
204-
+ "</pre>",
205-
structField = true)
206-
ProviderApi getAppleLoadableBundleBinaryConstructor();
207-
208183
@StarlarkMethod(
209184
name = "apple_host_system_env",
210185
doc =

‎src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/AppleDylibBinaryApi.java‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/AppleLoadableBundleBinaryApi.java‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryStarlarkApiTest.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import com.google.devtools.build.lib.testutil.Scratch;
4646
import com.google.devtools.build.lib.vfs.PathFragment;
4747
import java.io.IOException;
48-
import java.util.List;
4948
import java.util.Map;
5049
import java.util.Set;
5150
import net.starlark.java.eval.Dict;
@@ -382,7 +381,6 @@ protected String linkmapPath(String arch) throws Exception {
382381
}
383382

384383
@Test
385-
@SuppressWarnings("unchecked")
386384
public void testProvider_executable() throws Exception {
387385
scratch.file("examples/rule/BUILD");
388386
scratch.file(
@@ -394,7 +392,6 @@ public void testProvider_executable() throws Exception {
394392
" return MyInfo(",
395393
" binary = provider.binary,",
396394
" objc = provider.objc,",
397-
" dep_dir = dir(dep),",
398395
" )",
399396
"test_rule = rule(implementation = _test_rule_impl,",
400397
" attrs = {",
@@ -427,10 +424,6 @@ public void testProvider_executable() throws Exception {
427424

428425
assertThat(myInfo.getValue("binary")).isInstanceOf(Artifact.class);
429426
assertThat(myInfo.getValue("objc")).isInstanceOf(ObjcProvider.class);
430-
431-
List<String> depProviders = (List<String>) myInfo.getValue("dep_dir");
432-
assertThat(depProviders).doesNotContain("AppleDylibBinary");
433-
assertThat(depProviders).doesNotContain("AppleLoadableBundleBinary");
434427
}
435428

436429
@Test

0 commit comments

Comments
 (0)