commit 77c8496b5fd063e70d08a43ca6c994d2d7e7dc66
author Jamie Madill <jmadill@chromium.org> Fri Jun 28 11:24:27 2019 -0400
committer Commit Bot <commit-bot@chromium.org> Fri Jun 28 17:47:11 2019 +0000
tree 3eb702cad48260b806571c7790d1bc1cbf55e4aa
parent 8f1169eb305b8c22f438dd0e0f594ff02a621ac9

Re-land "Cleanup angle_libs_suffix in BUILD.gn."

We can use output_name instead of repeating the libs suffix in the GN
files.

The re-land adds automatic suffix application on Android. This makes
the configuration a bit simpler and should detect future breakage. Also
cleans up some of the "angle_libraries" code.

Bug: angleproject:3611
Change-Id: I4971d1085ca67802c916655c30efb7df4001f040
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1679993
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 0077222..072a2da 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -739,8 +739,9 @@
   ]
 }
 
-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_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 @@
 
   deps = [
     ":includes",
-    ":libGLESv2${angle_libs_suffix}",
+    ":libGLESv2",
   ]
 }
 
@@ -823,8 +825,9 @@
   ]
 }
 
-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 @@
   ]
 
   data_deps = [
-    ":libGLESv2${angle_libs_suffix}",
+    ":libGLESv2",
   ]
 }
 
@@ -1054,7 +1057,9 @@
   }
 }
 
-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" ]
   }
@@ -1086,11 +1091,11 @@
   action_foreach("compressed_symbols") {
     sources = []
     foreach(_library, angle_libraries) {
-      sources += [ "${root_out_dir}/lib${_library}${angle_libs_suffix}.so" ]
+      sources += [ "$root_out_dir/${_library}${angle_libs_suffix}.so" ]
     }
     if (angle_enable_vulkan_validation_layers) {
       foreach(_layer, vulkan_validation_layers) {
-        sources += [ "${root_out_dir}/lib${_layer}.so" ]
+        sources += [ "$root_out_dir/lib${_layer}.so" ]
       }
     }
 
@@ -1099,7 +1104,7 @@
 
     deps = []
     foreach(_library, angle_libraries) {
-      deps += [ "${angle_root}:lib${_library}${angle_libs_suffix}" ]
+      deps += [ ":$_library" ]
     }
 
     if (angle_enable_vulkan_validation_layers) {