Minor GN build cleanup.

Convert some static libraries to source sets.

Add an "icu" metalibrary that can be used by targets needing both ICU libs.

Rename some base targets to have shorter names.

BUG=
R=scottmg@chromium.org

Review URL: https://codereview.chromium.org/225093021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262442 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 33 insertions, 29 deletions

diff --git a/base/BUILD.gn b/base/BUILD.gn
index 468d76c..efbf87e 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -840,7 +840,7 @@ component("base") {
 # This is the subset of files from base that should not be used with a dynamic
 # library. Note that this library cannot depend on base because base depends on
 # base_static.
-static_library("base_static") {
+source_set("base_static") {
   sources = [
     "base_switches.cc",
     "base_switches.h",
@@ -849,7 +849,8 @@ static_library("base_static") {
   ]
 }
 
-component("base_i18n") {
+component("i18n") {
+  output_name = "base_i18n"
   sources = [
     "i18n/base_i18n_export.h",
     "i18n/bidi_line_iterator.cc",
@@ -884,8 +885,7 @@ component("base_i18n") {
   deps = [
     ":base",
     "//base/third_party/dynamic_annotations",
-    "//third_party/icu:icui18n",
-    "//third_party/icu:icuuc",
+    "//third_party/icu",
   ]
 
   if (toolkit_uses_gtk) {
diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn
index 24e4e10..23ac142 100644
--- a/base/test/BUILD.gn
+++ b/base/test/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//build/config/ui.gni")
 
-static_library("test_support_base") {
+source_set("test_support") {
   sources = [
     "expectations/expectation.cc",
     "expectations/expectation.h",
@@ -92,7 +92,7 @@ static_library("test_support_base") {
   deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
-    "//base:base_i18n",
+    "//base:i18n",
     "//base:base_static",
     "//testing/gmock",
     "//testing/gtest",
@@ -128,7 +128,7 @@ static_library("test_support_perf") {
     "run_all_perftests.cc",
   ]
   deps = [
-    ":test_support_base",
+    ":test_support",
     "//base",
     "//testing/gtest",
   ]
@@ -140,11 +140,11 @@ static_library("test_support_perf") {
   }
 }
 
-static_library("run_all_unittests") {
+source_set("run_all_unittests") {
   sources = [
     "run_all_unittests.cc",
   ]
   deps = [
-    ":test_support_base",
+    ":test_support",
   ]
 }
diff --git a/ipc/BUILD.gn b/ipc/BUILD.gn
index fbff819..0b426bd 100644
--- a/ipc/BUILD.gn
+++ b/ipc/BUILD.gn
@@ -118,9 +118,9 @@ test("ipc_tests") {
     ":ipc",
     ":test_support_ipc",
     "//base",
-    "//base:base_i18n",
+    "//base:i18n",
     "//base/test:run_all_unittests",
-    "//base/test:test_support_base",
+    "//base/test:test_support",
     "//testing/gtest",
   ]
 }
@@ -149,8 +149,8 @@ test("ipc_perftests") {
     ":ipc",
     ":test_support_ipc",
     "//base",
-    "//base:base_i18n",
-    "//base/test:test_support_base",
+    "//base:i18n",
+    "//base/test:test_support",
     "//base/test:test_support_perf",
     "//testing/gtest",
   ]
diff --git a/tools/gn/BUILD.gn b/tools/gn/BUILD.gn
index 44305f7..fe27b90 100644
--- a/tools/gn/BUILD.gn
+++ b/tools/gn/BUILD.gn
@@ -205,7 +205,7 @@ test("gn_unittests") {
   deps = [
     ":gn_lib",
     "//base/test:run_all_unittests",
-    "//base/test:test_support_base",
+    "//base/test:test_support",
     "//testing/gtest",
   ]
 }
diff --git a/tools/gn/secondary/chrome/BUILD.gn b/tools/gn/secondary/chrome/BUILD.gn
index 45d78a2..4ffae6d 100644
--- a/tools/gn/secondary/chrome/BUILD.gn
+++ b/tools/gn/secondary/chrome/BUILD.gn
@@ -135,8 +135,7 @@ source_set("debugger") {
     "//net",
     "//net:http_server",
     "//skia",
-    "//third_party/icu:icui18n",
-    "//third_party/icu:icuuc",
+    "//third_party/icu",
     "//third_party/leveldatabase",
     "//third_party/libusb",
   ]
diff --git a/tools/gn/secondary/crypto/BUILD.gn b/tools/gn/secondary/crypto/BUILD.gn
index b9ea117..50365c9 100644
--- a/tools/gn/secondary/crypto/BUILD.gn
+++ b/tools/gn/secondary/crypto/BUILD.gn
@@ -231,7 +231,7 @@ test("crypto_unittests") {
     ":crypto",
     "//base",
     "//base/test:run_all_unittests",
-    "//base/test:test_support_base",
+    "//base/test:test_support",
     "//testing/gmock",
     "//testing/gtest",
   ]
diff --git a/tools/gn/secondary/net/BUILD.gn b/tools/gn/secondary/net/BUILD.gn
index 81ca9af..f6461c0 100644
--- a/tools/gn/secondary/net/BUILD.gn
+++ b/tools/gn/secondary/net/BUILD.gn
@@ -1058,13 +1058,12 @@ component("net") {
   deps = [
     #":net_resources",
     "//base",
-    "//base:base_i18n",
+    "//base:i18n",
     "//base/third_party/dynamic_annotations",
     "//crypto",
     "//crypto/ssl:metassl",
     "//sdch",
-    "//third_party/icu:icui18n",
-    "//third_party/icu:icuuc",
+    "//third_party/icu",
     "//third_party/zlib",
     "//url",
   ]
diff --git a/tools/gn/secondary/third_party/WebKit/Source/platform/BUILD.gn b/tools/gn/secondary/third_party/WebKit/Source/platform/BUILD.gn
index 3f784b9..c1c0f1e 100644
--- a/tools/gn/secondary/third_party/WebKit/Source/platform/BUILD.gn
+++ b/tools/gn/secondary/third_party/WebKit/Source/platform/BUILD.gn
@@ -39,8 +39,7 @@ component("platform") {
 
   deps = [
     "//third_party/WebKit/Source/wtf",
-    "//third_party/icu:icui18n",
-    "//third_party/icu:icuuc",
+    "//third_party/icu",
     "//url",
   ]
 }
diff --git a/tools/gn/secondary/third_party/WebKit/Source/wtf/BUILD.gn b/tools/gn/secondary/third_party/WebKit/Source/wtf/BUILD.gn
index 1ec2f1c..ce46c64 100644
--- a/tools/gn/secondary/third_party/WebKit/Source/wtf/BUILD.gn
+++ b/tools/gn/secondary/third_party/WebKit/Source/wtf/BUILD.gn
@@ -249,8 +249,7 @@ component("wtf") {
 
   defines = [ "WTF_IMPLEMENTATION=1" ]
   deps = [
-    "//third_party/icu:icui18n",
-    "//third_party/icu:icuuc",
+    "//third_party/icu",
   ]
 
   #  # Disable c4267 warnings until we fix size_t to int truncations.
@@ -312,7 +311,7 @@ static_library("run_all_tests") {
   ]
 
   deps = [
-    "//base/test:test_support_base",
+    "//base/test:test_support",
     "//testing/gmock",
     "//testing/gtest",
     ":wtf",
diff --git a/tools/gn/secondary/third_party/icu/BUILD.gn b/tools/gn/secondary/third_party/icu/BUILD.gn
index 587f099..fc9da5e 100644
--- a/tools/gn/secondary/third_party/icu/BUILD.gn
+++ b/tools/gn/secondary/third_party/icu/BUILD.gn
@@ -2,6 +2,15 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# Meta target that includes both icuuc and icui18n. Most targets want both.
+# You can depend on the individually if you need to.
+group("icu") {
+  deps = [
+    ":icui18n",
+    ":icuuc",
+  ]
+}
+
 # Shared config used by ICU and all dependents.
 config("icu_config") {
   defines = [
diff --git a/tools/gn/secondary/third_party/leveldatabase/BUILD.gn b/tools/gn/secondary/third_party/leveldatabase/BUILD.gn
index 74b5c60..24a73c05 100644
--- a/tools/gn/secondary/third_party/leveldatabase/BUILD.gn
+++ b/tools/gn/secondary/third_party/leveldatabase/BUILD.gn
@@ -132,7 +132,7 @@ test("env_chromium_unittests") {
   ]
   deps = [
     ":leveldatabase",
-    "//base/test:test_support_base",
+    "//base/test:test_support",
     "//testing/gtest",
   ]
 }
diff --git a/url/BUILD.gn b/url/BUILD.gn
index 131bfd5..dc4cb0a 100644
--- a/url/BUILD.gn
+++ b/url/BUILD.gn
@@ -50,8 +50,7 @@ component("url") {
   deps = [
     "//base",
     "//third_party/icu:icudata",
-    "//third_party/icu:icui18n",
-    "//third_party/icu:icuuc",
+    "//third_party/icu",
   ]
 }
 
@@ -78,7 +77,7 @@ test("url_unittests") {
 
   deps = [
     ":url",
-    "//base:base_i18n",
+    "//base:i18n",
     "//base/test:run_all_unittests",
     "//testing/gtest",
     "//third_party/icu:icuuc",