Flip --incompatible_disable_objc_library_transition

bazelbuild · Sep 6, 2023 · b3fed5c · b3fed5c
1 parent 32ece76
commit b3fed5c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java b/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java
@@ -703,7 +703,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},
@@ -913,7 +913,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";
 

diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
@@ -690,6 +690,7 @@ protected Artifact j2objcArchive(String j2objcLibraryTarget, String javaTargetNa
 
   @Test
   public void testJ2ObjcInformationExportedFromObjcLibrary() throws Exception {
+    setBuildLanguageOptions("--incompatible_disable_objc_library_transition=false");
     scratch.file("app/lib.m");
     scratch.file(
         "app/BUILD",
@@ -720,6 +721,7 @@ public void testJ2ObjcInformationExportedFromObjcLibrary() throws Exception {
 
   @Test
   public void testJ2ObjcInfoExportedInObjcLibraryFromRuntimeDeps() throws Exception {
+    setBuildLanguageOptions("--incompatible_disable_objc_library_transition=false");
     scratch.file("app/lib.m");
     scratch.file(
         "app/BUILD",

diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
@@ -1016,7 +1016,7 @@ public void testAllowVariousNonBlacklistedTypesInHeaders() throws Exception {
 
   @Test
   public void testAppleSdkVersionEnv() throws Exception {
-    useConfiguration("--apple_platform_type=ios");
+    useConfiguration("--apple_platform_type=ios", "--cpu=ios_x86_64");
     createLibraryTargetWriter("//objc:lib")
         .setAndCreateFiles("srcs", "a.m", "b.m", "private.h")
         .setAndCreateFiles("hdrs", "c.h")
@@ -1028,7 +1028,9 @@ public void testAppleSdkVersionEnv() throws Exception {
 
   @Test
   public void testNonDefaultAppleSdkVersionEnv() throws Exception {
-    useConfiguration("--apple_platform_type=ios", "--ios_sdk_version=8.1");
+    useConfiguration(
+        "--apple_platform_type=ios", "--ios_sdk_version=8.1",
+        "--cpu=ios_x86_64");
 
     createLibraryTargetWriter("//objc:lib")
         .setAndCreateFiles("srcs", "a.m", "b.m", "private.h")
@@ -1109,7 +1111,7 @@ public void testSdkIncludesUsedInCompileAction() throws Exception {
 
   @Test
   public void testCompilationActionsWithPch() throws Exception {
-    useConfiguration("--apple_platform_type=ios");
+    useConfiguration("--apple_platform_type=ios", "--cpu=ios_x86_64");
     scratch.file("objc/foo.pch");
     createLibraryTargetWriter("//objc:lib")
         .setAndCreateFiles("srcs", "a.m", "b.m", "private.h")
@@ -1411,7 +1413,7 @@ public void testUsesDotdPruning() throws Exception {
 
   @Test
   public void testAppleSdkDefaultPlatformEnv() throws Exception {
-    useConfiguration("--apple_platform_type=ios");
+    useConfiguration("--apple_platform_type=ios", "--cpu=ios_x86_64");
     createLibraryTargetWriter("//objc:lib")
         .setAndCreateFiles("srcs", "a.m", "b.m", "private.h")
         .setAndCreateFiles("hdrs", "c.h")
@@ -1567,6 +1569,7 @@ public void testFilesToCompileOutputGroup() throws Exception {
   public void testDefaultEnabledFeatureIsUsed() throws Exception {
     // Although using --cpu=ios_x86_64, it transitions to darwin_x86_64, so the actual
     // cc_toolchain in use will be the darwin_x86_64 one.
+    setBuildLanguageOptions("--incompatible_disable_objc_library_transition=false");
     MockObjcSupport.setupCcToolchainConfig(
         mockToolsConfig, MockObjcSupport.darwinX86_64().withFeatures("default_feature"));
     useConfiguration("--cpu=ios_x86_64");
@@ -2075,7 +2078,7 @@ public void testPassesDependenciesStaticLibrariesInCcInfo() throws Exception {
                     .flatMap(List::stream)
                     .map(LibraryToLink::getStaticLibrary)
                     .collect(toImmutableList())))
-        .contains("/ x/libbaz.a");
+        .containsExactly("bin x/libbar.a", "bin x/libfoo.a", "bin x/libbaz.a");
   }
 
   @Test

diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
@@ -933,18 +933,22 @@ protected void checkClangCoptsForCompilationMode(
     switch (codeCoverageMode) {
       case NONE:
         useConfiguration(
-            "--apple_platform_type=ios", "--compilation_mode=" + compilationModeFlag(mode));
+            "--cpu=ios_x86_64",
+            "--apple_platform_type=ios",
+            "--compilation_mode=" + compilationModeFlag(mode));
         break;
       case GCOV:
         allExpectedCoptsBuilder.addAll(CompilationSupport.CLANG_GCOV_COVERAGE_FLAGS);
         useConfiguration(
+            "--cpu=ios_x86_64",
             "--apple_platform_type=ios",
             "--collect_code_coverage",
             "--compilation_mode=" + compilationModeFlag(mode));
         break;
       case LLVMCOV:
         allExpectedCoptsBuilder.addAll(CompilationSupport.CLANG_LLVM_COVERAGE_FLAGS);
         useConfiguration(
+            "--cpu=ios_x86_64",
             "--apple_platform_type=ios",
             "--collect_code_coverage",
             "--experimental_use_llvm_covmap",
@@ -967,7 +971,8 @@ protected void checkClangCoptsForDebugModeWithoutGlib(RuleType ruleType) throws
             .addAll(ObjcConfiguration.DBG_COPTS);
 
     useConfiguration(
-        "--apple_platform_type=ios", "--compilation_mode=dbg", "--objc_debug_with_GLIBCXX=false");
+        "--apple_platform_type=ios", "--compilation_mode=dbg", "--objc_debug_with_GLIBCXX=false",
+        "--cpu=ios_x86_64");
     scratch.file("x/a.m");
     ruleType.scratchTarget(scratch, "srcs", "['a.m']");