File tree 2 files changed +8
-2
lines changed
main/java/com/google/devtools/build/lib/packages/semantics
test/java/com/google/devtools/build/lib/rules/objc
2 files changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -651,7 +651,7 @@ public final class BuildLanguageOptions extends OptionsBase {
651
651
652
652
@ Option (
653
653
name = "incompatible_disable_objc_library_transition" ,
654
- defaultValue = "false " ,
654
+ defaultValue = "true " ,
655
655
documentationCategory = OptionDocumentationCategory .STARLARK_SEMANTICS ,
656
656
effectTags = {OptionEffectTag .BUILD_FILE_SEMANTICS },
657
657
metadataTags = {OptionMetadataTag .INCOMPATIBLE_CHANGE },
@@ -889,7 +889,7 @@ public StarlarkSemantics toStarlarkSemantics() {
889
889
public static final String INCOMPATIBLE_OBJC_PROVIDER_REMOVE_LINKING_INFO =
890
890
"-incompatible_objc_provider_remove_linking_info" ;
891
891
public static final String INCOMPATIBLE_DISABLE_OBJC_LIBRARY_TRANSITION =
892
- "- incompatible_disable_objc_library_transition" ;
892
+ "+ incompatible_disable_objc_library_transition" ;
893
893
public static final String INCOMPATIBLE_FAIL_ON_UNKNOWN_ATTRIBUTES =
894
894
"+incompatible_fail_on_unknown_attributes" ;
895
895
public static final String INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION =
Original file line number Diff line number Diff line change 69
69
import java .util .Map ;
70
70
import java .util .regex .Pattern ;
71
71
import javax .annotation .Nullable ;
72
+ import org .junit .Before ;
72
73
73
74
/**
74
75
* Superclass for all Obj-C rule tests.
@@ -89,6 +90,11 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase {
89
90
90
91
protected static final String OUTPUTDIR = TestConstants .PRODUCT_NAME + "-out//bin" ;
91
92
93
+ @ Before
94
+ public void setUp () throws Exception {
95
+ setBuildLanguageOptions ("--noincompatible_disable_objc_library_transition" );
96
+ }
97
+
92
98
/** Specification of code coverage behavior. */
93
99
public enum CodeCoverageMode {
94
100
// No code coverage information.
You can’t perform that action at this time.
0 commit comments