Remove the command line flag --experimental_cc_shared_library_debug.

RELNOTES[INC]: The --experimental_cc_shared_library_debug command line flag is not available anymore. PiperOrigin-RevId: 568537101 Change-Id: Ibbaf21cd9337b00b339f52eec78c0346354ab464
bazelbuild · Sep 26, 2023 · 92e16da · 92e16da
1 parent 6b2ff30
commit 92e16da
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 30 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
@@ -478,10 +478,6 @@ public boolean experimentalLinkStaticLibrariesOnce() {
     return cppOptions.experimentalLinkStaticLibrariesOnce;
   }
 
-  public boolean experimentalCcSharedLibraryDebug() {
-    return cppOptions.experimentalCcSharedLibraryDebug;
-  }
-
   public boolean experimentalPlatformCcTest() {
     return cppOptions.experimentalPlatformCcTest;
   }
@@ -934,12 +930,6 @@ public boolean getExperimentalLinkStaticLibrariesOnce(StarlarkThread thread)
     return experimentalLinkStaticLibrariesOnce();
   }
 
-  @Override
-  public boolean getExperimentalCcSharedLibraryDebug(StarlarkThread thread) throws EvalException {
-    CcModule.checkPrivateStarlarkificationAllowlist(thread);
-    return experimentalCcSharedLibraryDebug();
-  }
-
   @Override
   public boolean getExperimentalPlatformCcTest(StarlarkThread thread) throws EvalException {
     CcModule.checkPrivateStarlarkificationAllowlist(thread);

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
@@ -1134,17 +1134,6 @@ public Label getMemProfProfileLabel() {
               + " should only be linked once.")
   public boolean experimentalLinkStaticLibrariesOnce;
 
-  @Option(
-      name = "experimental_cc_shared_library_debug",
-      defaultValue = "false",
-      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-      effectTags = {
-        OptionEffectTag.LOADING_AND_ANALYSIS,
-      },
-      metadataTags = {OptionMetadataTag.EXPERIMENTAL},
-      help = "If enabled, will create debug files associated with cc_shared_library.")
-  public boolean experimentalCcSharedLibraryDebug;
-
   @Option(
       name = "experimental_cpp_compile_resource_estimation",
       defaultValue = "false",
@@ -1233,7 +1222,6 @@ public FragmentOptions getExec() {
       cxxoptListBuilder.add("-g0");
     }
     exec.experimentalLinkStaticLibrariesOnce = experimentalLinkStaticLibrariesOnce;
-    exec.experimentalCcSharedLibraryDebug = experimentalCcSharedLibraryDebug;
     exec.experimentalCcImplementationDeps = experimentalCcImplementationDeps;
 
     exec.coptList = coptListBuilder.addAll(hostCoptList).build();

diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/cpp/CppConfigurationApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/cpp/CppConfigurationApi.java
@@ -38,13 +38,7 @@ public interface CppConfigurationApi<InvalidConfigurationExceptionT extends Exce
       documented = false,
       useStarlarkThread = true)
   boolean getExperimentalLinkStaticLibrariesOnce(StarlarkThread thread) throws EvalException;
-
-  @StarlarkMethod(
-      name = "experimental_cc_shared_library_debug",
-      documented = false,
-      useStarlarkThread = true)
-  boolean getExperimentalCcSharedLibraryDebug(StarlarkThread thread) throws EvalException;
-
+
   @StarlarkMethod(
       name = "experimental_platform_cc_test",
       documented = false,

diff --git a/src/main/starlark/tests/builtins_bzl/cc_builtin_tests.sh b/src/main/starlark/tests/builtins_bzl/cc_builtin_tests.sh
@@ -69,7 +69,6 @@ EOF
   fi
 
   bazel $START_OPTS test --define=is_bazel=true --test_output=streamed \
-    --experimental_cc_shared_library_debug \
     //src/main/starlark/tests/builtins_bzl/cc/... || fail "expected success"
 }