Convert GN single-item list concat to use lists. R=scottmg@chromium.org, scottmg Review URL: https://codereview.chromium.org/138273007 Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: bfac272b9f8987c0c5ecc863a3c2d72ed879b77f
diff --git a/tools/gn/BUILD.gn b/tools/gn/BUILD.gn index ccb8024..1346f69 100644 --- a/tools/gn/BUILD.gn +++ b/tools/gn/BUILD.gn
@@ -177,7 +177,7 @@ ] if (!is_gyp) { # Currently this only works in GYP (see GN_BUILD above). - deps += "//build/util:last_change" + deps += [ "//build/util:last_change" ] } }
diff --git a/tools/gn/secondary/chrome/BUILD.gn b/tools/gn/secondary/chrome/BUILD.gn index 1d6217e..7ef82aa 100644 --- a/tools/gn/secondary/chrome/BUILD.gn +++ b/tools/gn/secondary/chrome/BUILD.gn
@@ -51,7 +51,7 @@ # TODO(brettw) this isn't right for all platforms. if (!use_aura) { - sources -= "app/chrome_exe_main_aura.cc" + sources -= [ "app/chrome_exe_main_aura.cc" ] } if (!is_win) { @@ -68,7 +68,7 @@ if (is_linux) { libs = [ "dl" ] if (toolkit_uses_gtk) { - libs += "gconf-2" + libs += [ "gconf-2" ] } } if (is_linux) { @@ -89,7 +89,7 @@ # common/net uses NSS. # TODO(brettw) have a better way to express this without having to do # "if (use_nss)" everywhere. - configs += "//third_party/nss:nss_linux_config" + configs += [ "//third_party/nss:nss_linux_config" ] } deps = [ ]
diff --git a/tools/gn/secondary/crypto/BUILD.gn b/tools/gn/secondary/crypto/BUILD.gn index ebadcee..0238740 100644 --- a/tools/gn/secondary/crypto/BUILD.gn +++ b/tools/gn/secondary/crypto/BUILD.gn
@@ -137,7 +137,7 @@ } if (use_nss) { - configs += "//third_party/nss:nss_linux_config" + configs += [ "//third_party/nss:nss_linux_config" ] } else { sources -= [ "ec_private_key_nss.cc",
diff --git a/tools/gn/secondary/ipc/BUILD.gn b/tools/gn/secondary/ipc/BUILD.gn index 376bad8..022bbf2 100644 --- a/tools/gn/secondary/ipc/BUILD.gn +++ b/tools/gn/secondary/ipc/BUILD.gn
@@ -99,7 +99,7 @@ ] if (is_win || is_ios) { - sources -= "unix_domain_socket_util_unittest.cc" + sources -= [ "unix_domain_socket_util_unittest.cc" ] } #if (is_android && gtest_target_type == "shared_library") { # deps += "/testing/android/native_test.gyp:native_testNative_code"
diff --git a/tools/gn/secondary/net/BUILD.gn b/tools/gn/secondary/net/BUILD.gn index b474ca3..8a8d121 100644 --- a/tools/gn/secondary/net/BUILD.gn +++ b/tools/gn/secondary/net/BUILD.gn
@@ -1109,7 +1109,7 @@ } if (is_linux && use_nss) { - configs += "//third_party/nss:nss_linux_config" + configs += [ "//third_party/nss:nss_linux_config" ] } if (is_chromeos) { @@ -1190,9 +1190,9 @@ posix_avoid_mmap = false # TODO(brettw) should be true on 32-bit Android. if (posix_avoid_mmap) { defines = [ "POSIX_AVOID_MMAP" ] - sources -= "disk_cache/mapped_file_posix.cc" + sources -= [ "disk_cache/mapped_file_posix.cc" ] } else { # !posix_avoid_mmap - sources -= "disk_cache/mapped_file_avoid_mmap_posix.cc" + sources -= [ "disk_cache/mapped_file_avoid_mmap_posix.cc" ] } } }
diff --git a/tools/gn/secondary/net/third_party/nss/BUILD.gn b/tools/gn/secondary/net/third_party/nss/BUILD.gn index ba5ecc2..8c3cadf 100644 --- a/tools/gn/secondary/net/third_party/nss/BUILD.gn +++ b/tools/gn/secondary/net/third_party/nss/BUILD.gn
@@ -67,8 +67,8 @@ "USE_UTIL_DIRECTLY", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] direct_dependent_configs = [ ":ssl_config" ] @@ -86,7 +86,7 @@ if (is_linux) { include_dirs = [ "bodge" ] - configs += "//third_party/nss:nss_linux_config" + configs += [ "//third_party/nss:nss_linux_config" ] } if (is_mac) { sources -= "ssl/bodge/secitem_array.c"
diff --git a/tools/gn/secondary/skia/BUILD.gn b/tools/gn/secondary/skia/BUILD.gn index 6a2ed7d..fcc09fa 100644 --- a/tools/gn/secondary/skia/BUILD.gn +++ b/tools/gn/secondary/skia/BUILD.gn
@@ -38,15 +38,15 @@ "//third_party/skia/include/gpu", "//third_party/skia/src/gpu", ] - defines += "SK_SUPPORT_GPU=1" + defines += [ "SK_SUPPORT_GPU=1" ] } else { - defines += "SK_SUPPORT_GPU=0" + defines += [ "SK_SUPPORT_GPU=0" ] } # For POSIX platforms, prefer the Mutex implementation provided by Skia # since it does not generate static initializers. if (is_posix) { - defines += "SK_USE_POSIX_THREADS" + defines += [ "SK_USE_POSIX_THREADS" ] } if (is_android) { @@ -111,13 +111,13 @@ "ext/vector_platform_device_skia.h", ] if (is_posix) { - skia_chrome_sources -= "ext/SkThread_chrome.cc" + skia_chrome_sources -= [ "ext/SkThread_chrome.cc" ] } if (is_ios) { - skia_chrome_sources -= "ext/vector_platform_device_skia.cc" + skia_chrome_sources -= [ "ext/vector_platform_device_skia.cc" ] } if (is_win) { - skia_chrome_sources -= "ext/SkThread_chrome.cc" + skia_chrome_sources -= [ "ext/SkThread_chrome.cc" ] } if (is_android && !enable_printing) { skia_chrome_sources -= [ @@ -179,7 +179,7 @@ "SK_DEFAULT_FONT_CACHE_LIMIT=1048576" # 1024 * 1024 ] } else { - defines += "SK_DEFAULT_FONT_CACHE_LIMIT=20971520" # 20 * 1024 * 1024 + defines += [ "SK_DEFAULT_FONT_CACHE_LIMIT=20971520" ] # 20 * 1024 * 1024 } if (is_win) { @@ -188,7 +188,7 @@ "//third_party/skia/src/utils/win", ] - defines += "SK_FONTHOST_USES_FONTMGR" + defines += [ "SK_FONTHOST_USES_FONTMGR" ] cflags = [ # TODO(brettw) comment what these are. @@ -1122,12 +1122,12 @@ ] if (skia_support_pdf) { - deps += "//third_party/sfntly" + deps += [ "//third_party/sfntly" ] } else { # TODO(brettw) remove PDF sources. } - configs -= "//build/config/compiler:chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] configs += [ ":skia_config", ":skia_library_config", @@ -1154,7 +1154,7 @@ external = true sources = skia_chrome_sources - configs -= "//build/config/compiler:chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] configs += [ ":skia_config", "//build/config/compiler:no_chromium_code", @@ -1203,7 +1203,7 @@ defines = [ "SKIA_IMPLEMENTATION=1", ] - configs -= "//build/config/compiler:chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] configs += [ ":skia_config", ":skia_library_config", @@ -1251,7 +1251,7 @@ "ext/convolver_SSE2.cc", ] - configs -= "//build/config/compiler:chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] configs += [ ":skia_config", "//build/config/compiler:no_chromium_code" @@ -1279,7 +1279,7 @@ "//third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp", ] - configs -= "//build/config/compiler:chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] configs += [ ":skia_config", "//build/config/compiler:no_chromium_code" @@ -1296,7 +1296,7 @@ "//third_party/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp", ] - configs -= "//build/config/compiler:chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] configs += [ ":skia_config", "//build/config/compiler:no_chromium_code"
diff --git a/tools/gn/secondary/testing/gtest/BUILD.gn b/tools/gn/secondary/testing/gtest/BUILD.gn index 5ee3721..82de0a6 100644 --- a/tools/gn/secondary/testing/gtest/BUILD.gn +++ b/tools/gn/secondary/testing/gtest/BUILD.gn
@@ -81,6 +81,6 @@ all_dependent_configs = [ ":gtest_config" ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] }
diff --git a/tools/gn/secondary/third_party/expat/BUILD.gn b/tools/gn/secondary/third_party/expat/BUILD.gn index b0ba187..814c336 100644 --- a/tools/gn/secondary/third_party/expat/BUILD.gn +++ b/tools/gn/secondary/third_party/expat/BUILD.gn
@@ -29,9 +29,9 @@ defines = [ "_LIB" ] if (is_win) { - defines += "COMPILED_FROM_DSP" + defines += [ "COMPILED_FROM_DSP" ] } else { - defines += "HAVE_EXPAT_CONFIG_H" + defines += [ "HAVE_EXPAT_CONFIG_H" ] } } }
diff --git a/tools/gn/secondary/third_party/icu/BUILD.gn b/tools/gn/secondary/third_party/icu/BUILD.gn index 2a9f3a6..cbe7335 100644 --- a/tools/gn/secondary/third_party/icu/BUILD.gn +++ b/tools/gn/secondary/third_party/icu/BUILD.gn
@@ -395,7 +395,7 @@ direct_dependent_configs = [ ":icu_config" ] if (!is_win) { - sources -= "source/stubdata/stubdata.c" + sources -= [ "source/stubdata/stubdata.c" ] } }
diff --git a/tools/gn/secondary/third_party/leveldatabase/BUILD.gn b/tools/gn/secondary/third_party/leveldatabase/BUILD.gn index d152538..d113aa5 100644 --- a/tools/gn/secondary/third_party/leveldatabase/BUILD.gn +++ b/tools/gn/secondary/third_party/leveldatabase/BUILD.gn
@@ -15,7 +15,7 @@ "src/include", ] if (is_win) { - include_dirs += "src/port/win" + include_dirs += [ "src/port/win" ] } } @@ -110,8 +110,8 @@ "src/util/status.cc", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] direct_dependent_configs = [ ":leveldatabase_config" ] @@ -122,8 +122,8 @@ ] if (use_snappy) { - defines += "USE_SNAPPY=1" - deps += "//third_party/snappy" + defines += [ "USE_SNAPPY=1" ] + deps += [ "//third_party/snappy" ] } } @@ -149,8 +149,8 @@ ] forward_dependent_configs_from = [ ":leveldatabase" ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ ":leveldatabase", @@ -162,8 +162,8 @@ sources = [ "src/util/arena_test.cc", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ ":leveldb_testutil", ] @@ -173,8 +173,8 @@ sources = [ "src/util/bloom_test.cc", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ ":leveldb_testutil", ] @@ -184,8 +184,8 @@ sources = [ "src/util/cache_test.cc", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ ":leveldb_testutil", ] @@ -195,8 +195,8 @@ sources = [ "src/db/corruption_test.cc", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ ":leveldb_testutil", ] @@ -206,8 +206,8 @@ sources = [ "src/util/crc32c_test.cc" ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ ":leveldb_testutil", ] @@ -217,8 +217,8 @@ sources = [ "src/db/db_bench.cc", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ ":leveldb_testutil", ] @@ -228,8 +228,8 @@ sources = [ "src/db/db_test.cc", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ ":leveldb_testutil", ] @@ -239,8 +239,8 @@ sources = [ "src/db/dbformat_test.cc", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ ":leveldb_testutil", ] @@ -250,8 +250,8 @@ sources = [ "src/util/env_test.cc", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ ":leveldb_testutil", ] @@ -261,8 +261,8 @@ sources = [ "src/db/filename_test.cc", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ ":leveldb_testutil", ] @@ -272,8 +272,8 @@ sources = [ "src/table/filter_block_test.cc", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ ":leveldb_testutil", ] @@ -283,8 +283,8 @@ sources = [ "src/db/log_test.cc", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ ":leveldb_testutil", ] @@ -294,8 +294,8 @@ sources = [ "src/db/skiplist_test.cc", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ ":leveldb_testutil", ] @@ -305,8 +305,8 @@ sources = [ "src/table/table_test.cc", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ ":leveldb_testutil", ] @@ -316,8 +316,8 @@ sources = [ "src/db/version_edit_test.cc", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ ":leveldb_testutil", ] @@ -327,8 +327,8 @@ sources = [ "src/db/write_batch_test.cc", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ ":leveldb_testutil", ]
diff --git a/tools/gn/secondary/third_party/libevent/BUILD.gn b/tools/gn/secondary/third_party/libevent/BUILD.gn index a990a3b..6896141 100644 --- a/tools/gn/secondary/third_party/libevent/BUILD.gn +++ b/tools/gn/secondary/third_party/libevent/BUILD.gn
@@ -38,6 +38,6 @@ sources -= [ "kqueue.c" ] } - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] }
diff --git a/tools/gn/secondary/third_party/libusb/BUILD.gn b/tools/gn/secondary/third_party/libusb/BUILD.gn index cf159ea..d4d6f6f 100644 --- a/tools/gn/secondary/third_party/libusb/BUILD.gn +++ b/tools/gn/secondary/third_party/libusb/BUILD.gn
@@ -48,8 +48,8 @@ "src/libusb/os", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] direct_dependent_configs = [ ":libusb_config" ] @@ -66,7 +66,7 @@ } if (is_mac) { - defines += "OS_DARWIN=1" + defines += [ "OS_DARWIN=1" ] } else { sources -= [ "src/libusb/os/darwin_usb.c", @@ -81,7 +81,7 @@ "USE_UDEV=1", "_GNU_SOURCE=1", ] - configs += "//build/config/linux:udev" + configs += [ "//build/config/linux:udev" ] } else { sources -= [ "src/libusb/os/linux_udev.c", @@ -91,9 +91,9 @@ } if (is_win) { - include_dirs += "src/msvc" + include_dirs += [ "src/msvc" ] } else { - include_dirs += "src" + include_dirs += [ "src" ] sources -= [ "src/libusb/os/poll_windows.c", "src/libusb/os/poll_windows.h",
diff --git a/tools/gn/secondary/third_party/libxml/BUILD.gn b/tools/gn/secondary/third_party/libxml/BUILD.gn index e77ae3b..96024ea 100644 --- a/tools/gn/secondary/third_party/libxml/BUILD.gn +++ b/tools/gn/secondary/third_party/libxml/BUILD.gn
@@ -140,8 +140,8 @@ "win32/include/libxml/xmlversion.h", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] direct_dependent_configs = [ ":libxml_config" ] forward_dependent_configs_from = [ "//third_party/icu:icuuc" ]
diff --git a/tools/gn/secondary/third_party/sfntly/BUILD.gn b/tools/gn/secondary/third_party/sfntly/BUILD.gn index 2f8f847..b2972f9 100644 --- a/tools/gn/secondary/third_party/sfntly/BUILD.gn +++ b/tools/gn/secondary/third_party/sfntly/BUILD.gn
@@ -122,8 +122,8 @@ defines = [ "SFNTLY_NO_EXCEPTION" ] include_dirs = [ "cpp/src" ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ "//third_party/icu:icuuc" ] }
diff --git a/tools/gn/secondary/third_party/snappy/BUILD.gn b/tools/gn/secondary/third_party/snappy/BUILD.gn index ba1a7b4..66f6f5b 100644 --- a/tools/gn/secondary/third_party/snappy/BUILD.gn +++ b/tools/gn/secondary/third_party/snappy/BUILD.gn
@@ -10,11 +10,11 @@ # These OS-specific generated headers were made by running the configure # script offline. if (is_win) { - include_dirs += "win32" + include_dirs += [ "win32" ] } else if (is_mac) { - include_dirs += "mac" + include_dirs += [ "mac" ] } else { - include_dirs += "linux" + include_dirs += [ "linux" ] } } @@ -29,8 +29,8 @@ "src/snappy.h", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] direct_dependent_configs = [ ":snappy_config" ] #['OS=="win"', { @@ -60,8 +60,8 @@ "src/snappy_unittest.cc", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] deps = [ ":snappy",
diff --git a/tools/gn/secondary/third_party/zlib/BUILD.gn b/tools/gn/secondary/third_party/zlib/BUILD.gn index 7724822..0e257f1 100644 --- a/tools/gn/secondary/third_party/zlib/BUILD.gn +++ b/tools/gn/secondary/third_party/zlib/BUILD.gn
@@ -44,8 +44,8 @@ "zutil.h", ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] direct_dependent_configs = [ ":zlib_config" ] } @@ -81,8 +81,8 @@ deps = [ ":zlib" ] - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] direct_dependent_configs = [ ":zlib_config" ] }