Revert output groups name of cc_library

Static libraries: cc_archive -> archive
Dynamic libraries: cc_dynamic_library -> dynamic_library

RELNOTES: None
PiperOrigin-RevId: 169374373

3 files changed, 13 insertions, 13 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java
index fd7a3cbb0a..750d666cbb 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java
@@ -90,10 +90,10 @@ public final class CcLibraryHelper {
           + OutputGroupProvider.INTERNAL_SUFFIX;
 
   /** A string constant for the name of archive library(.a, .lo) output group. */
-  public static final String ARCHIVE_LIBRARY_OUTPUT_GROUP_NAME = "cc_archive";
+  public static final String ARCHIVE_LIBRARY_OUTPUT_GROUP_NAME = "archive";
 
   /** A string constant for the name of dynamic library output group. */
-  public static final String DYNAMIC_LIBRARY_OUTPUT_GROUP_NAME = "cc_dynamic_library";
+  public static final String DYNAMIC_LIBRARY_OUTPUT_GROUP_NAME = "dynamic_library";
 
   /**
    * A group of source file types and action names for builds controlled by CcLibraryHelper.
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppOutputGroupsTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppOutputGroupsTest.java
index 9d8e537dab..7ed4ab72b6 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppOutputGroupsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppOutputGroupsTest.java
@@ -33,8 +33,8 @@ public class CppOutputGroupsTest extends BuildViewTestCase {
     scratch.file(
         "a/BUILD",
         "cc_library(name='lib', srcs=['src.cc'], linkstatic=1, alwayslink=0)",
-        "filegroup(name='group_archive', srcs=[':lib'], output_group = 'cc_archive')",
-        "filegroup(name='group_dynamic', srcs=[':lib'], output_group = 'cc_dynamic_library')");
+        "filegroup(name='group_archive', srcs=[':lib'], output_group = 'archive')",
+        "filegroup(name='group_dynamic', srcs=[':lib'], output_group = 'dynamic_library')");
 
     ConfiguredTarget groupArchive = getConfiguredTarget("//a:group_archive");
     ConfiguredTarget groupDynamic = getConfiguredTarget("//a:group_dynamic");
@@ -50,8 +50,8 @@ public class CppOutputGroupsTest extends BuildViewTestCase {
     scratch.file(
         "a/BUILD",
         "cc_library(name='lib', srcs=['src.cc'], linkstatic=1, alwayslink=1)",
-        "filegroup(name='group_archive', srcs=[':lib'], output_group = 'cc_archive')",
-        "filegroup(name='group_dynamic', srcs=[':lib'], output_group = 'cc_dynamic_library')");
+        "filegroup(name='group_archive', srcs=[':lib'], output_group = 'archive')",
+        "filegroup(name='group_dynamic', srcs=[':lib'], output_group = 'dynamic_library')");
 
     ConfiguredTarget groupArchive = getConfiguredTarget("//a:group_archive");
     ConfiguredTarget groupDynamic = getConfiguredTarget("//a:group_dynamic");
@@ -67,8 +67,8 @@ public class CppOutputGroupsTest extends BuildViewTestCase {
     scratch.file(
         "a/BUILD",
         "cc_library(name='lib', srcs=['src.cc'], linkstatic=0, alwayslink=0)",
-        "filegroup(name='group_archive', srcs=[':lib'], output_group = 'cc_archive')",
-        "filegroup(name='group_dynamic', srcs=[':lib'], output_group = 'cc_dynamic_library')");
+        "filegroup(name='group_archive', srcs=[':lib'], output_group = 'archive')",
+        "filegroup(name='group_dynamic', srcs=[':lib'], output_group = 'dynamic_library')");
 
     ConfiguredTarget groupArchive = getConfiguredTarget("//a:group_archive");
     ConfiguredTarget groupDynamic = getConfiguredTarget("//a:group_dynamic");
@@ -87,8 +87,8 @@ public class CppOutputGroupsTest extends BuildViewTestCase {
     scratch.file(
         "a/BUILD",
         "cc_library(name='lib', srcs=['src.cc'], linkstatic=0, alwayslink=1)",
-        "filegroup(name='group_archive', srcs=[':lib'], output_group = 'cc_archive')",
-        "filegroup(name='group_dynamic', srcs=[':lib'], output_group = 'cc_dynamic_library')");
+        "filegroup(name='group_archive', srcs=[':lib'], output_group = 'archive')",
+        "filegroup(name='group_dynamic', srcs=[':lib'], output_group = 'dynamic_library')");
 
     ConfiguredTarget groupArchive = getConfiguredTarget("//a:group_archive");
     ConfiguredTarget groupDynamic = getConfiguredTarget("//a:group_dynamic");
diff --git a/src/test/py/bazel/bazel_windows_dynamic_link_test.py b/src/test/py/bazel/bazel_windows_dynamic_link_test.py
index 1093037ad0..e6652ff157 100644
--- a/src/test/py/bazel/bazel_windows_dynamic_link_test.py
+++ b/src/test/py/bazel/bazel_windows_dynamic_link_test.py
@@ -134,7 +134,7 @@ class BazelWindowsDynamicLinkTest(test_base.TestBase):
     # //:A export symbols by itself using __declspec(dllexport), so it doesn't
     # need Bazel to export symbols using DEF file.
     exit_code, _, stderr = self.RunBazel(
-        ['build', '//:A', '--output_groups=cc_dynamic_library'])
+        ['build', '//:A', '--output_groups=dynamic_library'])
     self.AssertExitCode(exit_code, 0, stderr)
 
     # TODO(pcloudy): change suffixes to .lib and .dll after making DLL
@@ -155,7 +155,7 @@ class BazelWindowsDynamicLinkTest(test_base.TestBase):
     # //:B doesn't export symbols by itself, so it need Bazel to export symbols
     # using DEF file.
     exit_code, _, stderr = self.RunBazel(
-        ['build', '//:B', '--output_groups=cc_dynamic_library'])
+        ['build', '//:B', '--output_groups=dynamic_library'])
     self.AssertExitCode(exit_code, 0, stderr)
 
     # TODO(pcloudy): change suffixes to .lib and .dll after making DLL
@@ -172,7 +172,7 @@ class BazelWindowsDynamicLinkTest(test_base.TestBase):
     # Test build //:B if windows_export_all_symbols feature is disabled by
     # no_windows_export_all_symbols.
     exit_code, _, stderr = self.RunBazel([
-        'build', '//:B', '--output_groups=cc_dynamic_library',
+        'build', '//:B', '--output_groups=dynamic_library',
         '--features=no_windows_export_all_symbols'
     ])
     self.AssertExitCode(exit_code, 1, stderr)