Skip to content

Commit 60ebabb

Browse files
ted-xiecopybara-github
authored andcommitted
Automated rollback of commit 5e77c59.
*** Reason for rollback *** Breaks several rules_apple test in Blaze nightly TGP. See [] *** Original change description *** Remove archive from runfiles At some point we should probably merge runfiles from input attributes like cc_library does. PiperOrigin-RevId: 671475648 Change-Id: Ica3da53a8810b4407fc2ef42bda02f009750c697
1 parent b7e3e4f commit 60ebabb

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

src/main/starlark/builtins_bzl/common/objc/objc_library.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ def _objc_library_impl(ctx):
9999
)
100100

101101
return [
102-
# TODO(b/360366113): propagate runfiles of inputs (like cc_library).
103102
DefaultInfo(
104103
files = depset(files),
104+
data_runfiles = ctx.runfiles(files = files),
105105
),
106106
CcInfo(
107107
compilation_context = compilation_context,

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
3939
import com.google.devtools.build.lib.analysis.FilesToRunProvider;
4040
import com.google.devtools.build.lib.analysis.OutputGroupInfo;
41+
import com.google.devtools.build.lib.analysis.RunfilesProvider;
4142
import com.google.devtools.build.lib.analysis.actions.SpawnAction;
4243
import com.google.devtools.build.lib.analysis.config.CompilationMode;
4344
import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget;
@@ -365,6 +366,18 @@ public void testCompilationModeOpt() throws Exception {
365366
assertThat(compileActionA.getArguments()).contains("--OPT_ONLY_FLAG");
366367
}
367368

369+
@Test
370+
public void testCreate_runfilesWithSourcesOnly() throws Exception {
371+
ConfiguredTarget target =
372+
createLibraryTargetWriter("//objc:One")
373+
.setAndCreateFiles("srcs", "a.m", "b.m", "private.h")
374+
.write();
375+
RunfilesProvider provider = target.getProvider(RunfilesProvider.class);
376+
assertThat(baseArtifactNames(provider.getDefaultRunfiles().getArtifacts())).isEmpty();
377+
assertThat(Artifact.toRootRelativePaths(provider.getDataRunfiles().getArtifacts()))
378+
.containsExactly("objc/libOne.a");
379+
}
380+
368381
@Test
369382
public void testCreate_noErrorForEmptySourcesButHasDependency() throws Exception {
370383
createLibraryTargetWriter("//baselib:baselib")

0 commit comments

Comments
 (0)