Skip to content

Commit

Permalink
Flip --incompatible_disable_objc_library_transition
Browse files Browse the repository at this point in the history
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
  • Loading branch information
comius authored and copybara-github committed Oct 21, 2023
1 parent 755579d commit b4292d2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ public final class BuildLanguageOptions extends OptionsBase {

@Option(
name = "incompatible_disable_objc_library_transition",
defaultValue = "false",
defaultValue = "true",
documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
Expand Down Expand Up @@ -889,7 +889,7 @@ public StarlarkSemantics toStarlarkSemantics() {
public static final String INCOMPATIBLE_OBJC_PROVIDER_REMOVE_LINKING_INFO =
"-incompatible_objc_provider_remove_linking_info";
public static final String INCOMPATIBLE_DISABLE_OBJC_LIBRARY_TRANSITION =
"-incompatible_disable_objc_library_transition";
"+incompatible_disable_objc_library_transition";
public static final String INCOMPATIBLE_FAIL_ON_UNKNOWN_ATTRIBUTES =
"+incompatible_fail_on_unknown_attributes";
public static final String INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
import java.util.Map;
import java.util.regex.Pattern;
import javax.annotation.Nullable;
import org.junit.Before;

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

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

@Before
public void setUp() throws Exception {
setBuildLanguageOptions("--noincompatible_disable_objc_library_transition");
}

/** Specification of code coverage behavior. */
public enum CodeCoverageMode {
// No code coverage information.
Expand Down

0 comments on commit b4292d2

Please sign in to comment.