Cleanup angle_libs_suffix in BUILD.gn.

BUILD.gn

@@ -739,8 +739,9 @@ config("angle_static") {
   ]
 }
 
-angle_shared_library("libGLESv2${angle_libs_suffix}") {
+angle_shared_library("libGLESv2") {
   sources = libglesv2_sources
+  output_name = "libGLESv2${angle_libs_suffix}"
 
   if (is_win) {
     sources += [ "src/libGLESv2/libGLESv2_autogen.def" ]
@@ -776,8 +777,9 @@ angle_static_library("libGLESv2_static") {
   ]
 }
 
-angle_shared_library("libGLESv1_CM${angle_libs_suffix}") {
+angle_shared_library("libGLESv1_CM") {
   sources = libglesv1_cm_sources
+  output_name = "libGLESv1_CM${angle_libs_suffix}"
 
   configs += [
     ":angle_gl_visibility_config",
@@ -789,7 +791,7 @@ angle_shared_library("libGLESv1_CM${angle_libs_suffix}") {
 
   deps = [
     ":includes",
-    ":libGLESv2${angle_libs_suffix}",
+    ":libGLESv2",
   ]
 }
 
@@ -823,8 +825,9 @@ angle_source_set("libEGL_egl_loader") {
   ]
 }
 
-angle_shared_library("libEGL${angle_libs_suffix}") {
+angle_shared_library("libEGL") {
   sources = libegl_sources
+  output_name = "libEGL${angle_libs_suffix}"
 
   configs += [
     ":debug_annotations_config",
@@ -853,7 +856,7 @@ angle_shared_library("libEGL${angle_libs_suffix}") {
   ]
 
   data_deps = [
-    ":libGLESv2${angle_libs_suffix}",
+    ":libGLESv2",
   ]
 }
 
@@ -1054,7 +1057,9 @@ config("angle_feature_support_config") {
   }
 }
 
-angle_shared_library("libfeature_support${angle_libs_suffix}") {
+angle_shared_library("libfeature_support") {
+  output_name = "libfeature_support${angle_libs_suffix}"
+
   if (is_android) {
     libs = [ "log" ]
   }

samples/BUILD.gn

@@ -28,9 +28,9 @@ angle_static_library("sample_util") {
     "sample_util/tga_utils.h",
   ]
   data_deps = [
-    "../:libEGL${angle_libs_suffix}",
-    "../:libGLESv1_CM${angle_libs_suffix}",
-    "../:libGLESv2${angle_libs_suffix}",
+    "../:libEGL",
+    "../:libGLESv1_CM",
+    "../:libGLESv2",
   ]
   public_deps = [
     "../:angle_common",

src/tests/BUILD.gn

@@ -142,7 +142,7 @@ angle_test("angle_unittests") {
            ":angle_test_expectations",
            "${angle_root}:preprocessor",
            "${angle_root}:translator",
-           "${angle_root}:libfeature_support${angle_libs_suffix}",
+           "${angle_root}:libfeature_support",
            ":angle_unittests_main",
          ]
   if (!is_android && !is_fuchsia) {
@@ -195,9 +195,9 @@ if (is_win || is_linux || is_mac || is_android || is_fuchsia) {
     ]
 
     data_deps = [
-      "${angle_root}:libEGL${angle_libs_suffix}",
-      "${angle_root}:libGLESv1_CM${angle_libs_suffix}",
-      "${angle_root}:libGLESv2${angle_libs_suffix}",
+      "${angle_root}:libEGL",
+      "${angle_root}:libGLESv1_CM",
+      "${angle_root}:libGLESv2",
     ]
 
     if (is_android) {
@@ -301,8 +301,8 @@ if (is_win || is_linux || is_android || is_mac || is_fuchsia) {
     ]
 
     data_deps = [
-      "${angle_root}:libEGL${angle_libs_suffix}",
-      "${angle_root}:libGLESv2${angle_libs_suffix}",
+      "${angle_root}:libEGL",
+      "${angle_root}:libGLESv2",
     ]
 
     configs += [
@@ -816,8 +816,8 @@ if (build_angle_deqp_tests && !is_fuchsia) {
       ":angle_deqp_glshared",
       "${angle_root}:angle_common",
       "${angle_root}:angle_util",
-      "${angle_root}:libEGL${angle_libs_suffix}",
-      "${angle_root}:libGLESv2${angle_libs_suffix}",
+      "${angle_root}:libEGL",
+      "${angle_root}:libGLESv2",
     ]
 
     configs += [ "${angle_root}:library_name_config" ]