Skip to content

Commit b4292d2

Browse files
comiuscopybara-github
authored andcommitted
Flip --incompatible_disable_objc_library_transition
Downstream tests: https://buildkite.com/bazel/bazel-at-head-plus-downstream/builds/3393 RELNOTES[INC]: transition is removed from objc_library (bazelbuild#19688) PiperOrigin-RevId: 575438171 Change-Id: I2deed40dbb289255623d8c8281157ea3326901a2
1 parent 755579d commit b4292d2

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ public final class BuildLanguageOptions extends OptionsBase {
651651

652652
@Option(
653653
name = "incompatible_disable_objc_library_transition",
654-
defaultValue = "false",
654+
defaultValue = "true",
655655
documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
656656
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
657657
metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
@@ -889,7 +889,7 @@ public StarlarkSemantics toStarlarkSemantics() {
889889
public static final String INCOMPATIBLE_OBJC_PROVIDER_REMOVE_LINKING_INFO =
890890
"-incompatible_objc_provider_remove_linking_info";
891891
public static final String INCOMPATIBLE_DISABLE_OBJC_LIBRARY_TRANSITION =
892-
"-incompatible_disable_objc_library_transition";
892+
"+incompatible_disable_objc_library_transition";
893893
public static final String INCOMPATIBLE_FAIL_ON_UNKNOWN_ATTRIBUTES =
894894
"+incompatible_fail_on_unknown_attributes";
895895
public static final String INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION =

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
import java.util.Map;
7070
import java.util.regex.Pattern;
7171
import javax.annotation.Nullable;
72+
import org.junit.Before;
7273

7374
/**
7475
* Superclass for all Obj-C rule tests.
@@ -89,6 +90,11 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase {
8990

9091
protected static final String OUTPUTDIR = TestConstants.PRODUCT_NAME + "-out//bin";
9192

93+
@Before
94+
public void setUp() throws Exception {
95+
setBuildLanguageOptions("--noincompatible_disable_objc_library_transition");
96+
}
97+
9298
/** Specification of code coverage behavior. */
9399
public enum CodeCoverageMode {
94100
// No code coverage information.

0 commit comments

Comments
 (0)