Revert "Cleanup angle_libs_suffix in BUILD.gn."

This reverts commit 625f5b2f. Reason for revert: Seems to break the Android build with suffix: ~/chromium/src$ gn args out/Release64 Waiting for editor on "/usr/local/google/home/cnorthrop/chromium/src/out/Release64/args.gn"... Generating files... ERROR Unresolved dependencies. //third_party/angle:compressed_symbols(//build/toolchain/android:android_clang_arm) needs //third_party/angle:libEGL_angle(//build/toolchain/android:android_clang_arm) //third_party/angle:compressed_symbols(//build/toolchain/android:android_clang_arm) needs //third_party/angle:libGLESv1_CM_angle(//build/toolchain/android:android_clang_arm) <snip> Original change's description: > Cleanup angle_libs_suffix in BUILD.gn. > > We can use output_name instead of repeating the libs suffix in the GN > files. > > Bug: angleproject:3611 > Change-Id: Ic87c1378aac8be8e1aec695ddbe5c8ec2ed3187b > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1678403 > Commit-Queue: Jamie Madill <jmadill@chromium.org> > Reviewed-by: Tim Van Patten <timvp@google.com> > Reviewed-by: Geoff Lang <geofflang@chromium.org> TBR=geofflang@chromium.org,timvp@google.com,jmadill@chromium.org Change-Id: I532d9cf28c21ddf65d820d3fc323c87dbc844d96 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: angleproject:3611 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1679990Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Revert "Cleanup angle_libs_suffix in BUILD.gn."
3e6e70bb · Jamie Madill · Commit Bot · 2074d5f7 · 3e6e70bb · 3e6e70bb
Commit 3e6e70bb authored Jun 28, 2019 by Jamie Madill Committed by Commit Bot Jun 28, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 22 deletions

BUILD.gn BUILD.gn +6 -11

BUILD.gn samples/BUILD.gn +3 -3

BUILD.gn src/tests/BUILD.gn +8 -8

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -739,9 +739,8 @@ config("angle_static") {
  ]
 }

-angle_shared_library("libGLESv2") {
+angle_shared_library("libGLESv2${angle_libs_suffix}") {
  sources = libglesv2_sources
-  output_name = "libGLESv2${angle_libs_suffix}"

  if (is_win) {
    sources += [ "src/libGLESv2/libGLESv2_autogen.def" ]
@@ -777,9 +776,8 @@ angle_static_library("libGLESv2_static") {
  ]
 }

-angle_shared_library("libGLESv1_CM") {
+angle_shared_library("libGLESv1_CM${angle_libs_suffix}") {
  sources = libglesv1_cm_sources
-  output_name = "libGLESv1_CM${angle_libs_suffix}"

  configs += [
    ":angle_gl_visibility_config",
@@ -791,7 +789,7 @@ angle_shared_library("libGLESv1_CM") {

  deps = [
    ":includes",
-    ":libGLESv2",
+    ":libGLESv2${angle_libs_suffix}",
  ]
 }

@@ -825,9 +823,8 @@ angle_source_set("libEGL_egl_loader") {
  ]
 }

-angle_shared_library("libEGL") {
+angle_shared_library("libEGL${angle_libs_suffix}") {
  sources = libegl_sources
-  output_name = "libEGL${angle_libs_suffix}"

  configs += [
    ":debug_annotations_config",
@@ -856,7 +853,7 @@ angle_shared_library("libEGL") {
  ]

  data_deps = [
-    ":libGLESv2",
+    ":libGLESv2${angle_libs_suffix}",
  ]
 }

@@ -1057,9 +1054,7 @@ config("angle_feature_support_config") {
  }
 }

-angle_shared_library("libfeature_support") {
-  output_name = "libfeature_support${angle_libs_suffix}"
-
+angle_shared_library("libfeature_support${angle_libs_suffix}") {
  if (is_android) {
    libs = [ "log" ]
  }

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

--- a/src/tests/BUILD.gn
+++ b/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_root}:libfeature_support${angle_libs_suffix}",
           ":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_root}:libGLESv1_CM",
-      "${angle_root}:libGLESv2",
+      "${angle_root}:libEGL${angle_libs_suffix}",
+      "${angle_root}:libGLESv1_CM${angle_libs_suffix}",
+      "${angle_root}:libGLESv2${angle_libs_suffix}",
    ]

    if (is_android) {
@@ -301,8 +301,8 @@ if (is_win || is_linux || is_android || is_mac || is_fuchsia) {
    ]

    data_deps = [
-      "${angle_root}:libEGL",
-      "${angle_root}:libGLESv2",
+      "${angle_root}:libEGL${angle_libs_suffix}",
+      "${angle_root}:libGLESv2${angle_libs_suffix}",
    ]

    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_root}:libGLESv2",
+      "${angle_root}:libEGL${angle_libs_suffix}",
+      "${angle_root}:libGLESv2${angle_libs_suffix}",
    ]

    configs += [ "${angle_root}:library_name_config" ]