Convert GN single-item list concat to use lists.

R=scottmg@chromium.org, scottmg

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

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

base/BUILD.gn

@@ -674,7 +674,7 @@ component("base") {
   ]
 
   # TODO(brettw) I don't understand the conditions this file is used.
-  sources -= "files/file_path_watcher_stub.cc"
+  sources -= [ "files/file_path_watcher_stub.cc" ]
 
   sources -= [
     # TODO(brettw) do these properly.
@@ -752,12 +752,12 @@ component("base") {
     ]
 
     if (is_component_build) {
-      sources -= "debug/debug_on_start_win.cc"
+      sources -= [ "debug/debug_on_start_win.cc" ]
     }
   } else if (!is_nacl) {
     # Non-Windows.
-    deps += "//third_party/libevent"
-    libs += "dl"
+    deps += [ "//third_party/libevent" ]
+    libs += [ "dl" ]
   }
 
   # Mac.
@@ -767,7 +767,7 @@ component("base") {
       "native_library_posix.cc",
       "strings/sys_string_conversions_posix.cc",
     ]
-    deps += "//third_party/mach_override"
+    deps += [ "//third_party/mach_override" ]
     libs += [
       "AppKit.framework",
       "ApplicationServices.framework",
@@ -779,7 +779,7 @@ component("base") {
     ]
   } else {
     # Non-Mac.
-    sources -= "files/file_path_watcher_kqueue.cc"
+    sources -= [ "files/file_path_watcher_kqueue.cc" ]
   }
 
   # IOS.
@@ -883,7 +883,7 @@ component("base_i18n") {
 
   if (toolkit_uses_gtk) {
     # i18n/rtl.cc uses gtk
-    configs += "//build/config/linux:gtk"
+    configs += [ "//build/config/linux:gtk" ]
   }
 
   #'conditions': [

base/test/BUILD.gn

@@ -106,7 +106,7 @@ static_library("test_support_base") {
   }
   if (is_ios) {
     # iOS uses its own unit test launcher.
-    sources -= "launcher/unit_test_launcher.cc"
+    sources -= [ "launcher/unit_test_launcher.cc" ]
 
     # Pull in specific Mac files for iOS (which have been filtered out
     # by file name rules).
@@ -114,7 +114,7 @@ static_library("test_support_base") {
     sources += "test_file_util_mac.cc"
   }
   if (toolkit_uses_gtk) {
-    configs += "//build/config/linux:gtk"
+    configs += [ "//build/config/linux:gtk" ]
   }
 }
 
@@ -135,7 +135,7 @@ static_library("test_support_perf") {
   direct_dependent_configs = [ ":perf_test_config" ]
 
   if (toolkit_uses_gtk) {
-    configs += "//build/config/linux:gtk"
+    configs += [ "//build/config/linux:gtk" ]
   }
 }
 

base/third_party/symbolize/BUILD.gn

@@ -15,6 +15,6 @@ static_library("symbolize") {
     "utilities.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" ]
 }

base/third_party/xdg_mime/BUILD.gn

@@ -23,6 +23,6 @@ static_library("xdg_mime") {
     "xdgmimeparent.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" ]
 }

build/config/BUILDCONFIG.gn

@@ -328,18 +328,18 @@ if (is_win) {
     "//build/config/win:sdk",
   ]
 } else if (is_clang) {
-  native_compiler_configs += "//build/config/clang:find_bad_constructs"
+  native_compiler_configs += [ "//build/config/clang:find_bad_constructs" ]
 }
 
 # Optimizations and debug checking.
 if (is_debug) {
-  native_compiler_configs += "//build/config:debug"
+  native_compiler_configs += [ "//build/config:debug" ]
   default_optimization_config = "//build/config/compiler:no_optimize"
 } else {
-  native_compiler_configs += "//build/config:release"
+  native_compiler_configs += [ "//build/config:release" ]
   default_optimization_config = "//build/config/compiler:optimize"
 }
-native_compiler_configs += default_optimization_config
+native_compiler_configs += [ default_optimization_config ]
 
 # Symbol setup.
 if (is_clang && (is_linux || is_android)) {
@@ -357,7 +357,7 @@ if (is_clang && (is_linux || is_android)) {
 } else {
   assert(false, "Bad value for symbol_level.")
 }
-native_compiler_configs += default_symbols_config
+native_compiler_configs += [ default_symbols_config ]
 
 # Windows linker setup for EXEs and DLLs.
 if (is_win) {
@@ -383,9 +383,9 @@ set_defaults("executable") {
   if (is_win) {
     configs += windows_linker_configs
   } else if (is_mac) {
-    configs += "//build/config/mac:mac_dynamic_flags"
+    configs += [ "//build/config/mac:mac_dynamic_flags" ]
   } else if (is_linux) {
-    configs += "//build/config/linux:executable_ldconfig"
+    configs += [ "//build/config/linux:executable_ldconfig" ]
   }
 }
 
@@ -398,7 +398,7 @@ set_defaults("shared_library") {
   if (is_win) {
     configs += windows_linker_configs
   } else if (is_mac) {
-    configs += "//build/config/mac:mac_dynamic_flags"
+    configs += [ "//build/config/mac:mac_dynamic_flags" ]
   }
 }
 

build/config/clang/BUILD.gn

@@ -9,13 +9,13 @@ config("find_bad_constructs") {
   ]
 
   if (is_mac) {
-    cflags += rebase_path(
+    cflags += [ rebase_path(
       "//third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
-      ".", root_build_dir)
+      ".", root_build_dir) ]
   } else if (is_linux) {
-    cflags += rebase_path(
+    cflags += [ rebase_path(
       "//third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so",
-      ".", root_build_dir)
+      ".", root_build_dir) ]
   }
 
   cflags += [

build/config/compiler/BUILD.gn

@@ -53,7 +53,7 @@ config("compiler") {
 
     # Stack protection.
     if (is_mac) {
-      cflags += "-fstack-protector-all"
+      cflags += [ "-fstack-protector-all" ]
     } else if (is_linux) {
       cflags += [ "-fstack-protector", "--param=ssp-buffer-size=4" ]
     }
@@ -70,9 +70,9 @@ config("compiler") {
 
     # CPU architecture.
     if (cpu_arch == "x64") {
-      common_mac_flags += "-arch x86_64"
+      common_mac_flags += [ "-arch x86_64" ]
     } else if (cpu_arch == "x86") {
-      common_mac_flags += "-arch i386"
+      common_mac_flags += [ "-arch i386" ]
     }
 
     cflags += common_mac_flags + [
@@ -98,11 +98,11 @@ config("compiler") {
     # CPU architecture. We may or may not be doing a cross compile now, so for
     # simplicity we always explicitly set the architecture.
     if (cpu_arch == "x64") {
-      cflags += "-m64"
-      ldflags += "-m64"
+      cflags += [ "-m64" ]
+      ldflags += [ "-m64" ]
     } else if (cpu_arch == "x86") {
-      cflags += "-m32"
-      ldflags += "-m32"
+      cflags += [ "-m32" ]
+      ldflags += [ "-m32" ]
     } else if (cpu_arch == "arm") {
       # Don't set the compiler flags for the WebView build. These will come
       # from the Android build system.
@@ -113,7 +113,7 @@ config("compiler") {
           "-mfloat-abi=$arm_float_abi",
         ]
         if (arm_tune != "") {
-          cflags += "-mtune=$arm_tune"
+          cflags += [ "-mtune=$arm_tune" ]
         }
         if (arm_use_thumb) {
           cflags += [ "-mthumb" ]
@@ -174,14 +174,14 @@ config("compiler") {
     }
 
     if (sysroot != "") {
-      cflags += "--sysroot=" + sysroot
-      ldflags += "--sysroot=" + sysroot
+      cflags += [ "--sysroot=" + sysroot ]
+      ldflags += [ "--sysroot=" + sysroot ]
 
       # Need to get some linker flags out of the sysroot.
-      ldflags += exec_script("../linux/sysroot_ld_path.py",
+      ldflags += [ exec_script("../linux/sysroot_ld_path.py",
           [rebase_path("../../linux/sysroot_ld_path.sh", ".", root_build_dir),
            sysroot],
-          "value")
+          "value") ]
     }
 
     ldflags += [

build/config/win/BUILD.gn

@@ -61,9 +61,9 @@ config("sdk_link") {
       "$visual_studio_path\VC\lib",
       "$visual_studio_path\VC\atlmfc\lib",
     ]
-    #if (!is_asan) {  TODO(brettw) Address Sanitizer
-    #  ldflags += "/largeaddressaware"
-    #}
+    if (!is_asan) {
+      ldflags += [ "/largeaddressaware" ]
+    }
   }
 }
 

third_party/libpng/BUILD.gn

@@ -53,8 +53,8 @@ static_library("libpng") {
     "pngwutil.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" ]
 
   forward_dependent_configs_from = [ "//third_party/zlib" ]
 

third_party/re2/BUILD.gn

@@ -59,8 +59,8 @@ static_library("re2") {
     "util/util.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 = [ ":re2_config" ]
 
   deps = [
@@ -70,6 +70,6 @@ static_library("re2") {
   if (is_win) {
     include_dirs = [ "mswin" ]
   } else {
-    sources -= "mswin/stdint.h"
+    sources -= [ "mswin/stdint.h" ]
   }
 }

tools/gn/BUILD.gn

@@ -177,7 +177,7 @@ executable("gn") {
   ]
   if (!is_gyp) {
     # Currently this only works in GYP (see GN_BUILD above).
-    deps += "//build/util:last_change"
+    deps += [ "//build/util:last_change" ]
   }
 }
 

tools/gn/secondary/chrome/BUILD.gn

@@ -51,7 +51,7 @@ executable("chrome") {
 
   # 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 @@ static_library("browser") {
   if (is_linux) {
     libs = [ "dl" ]
     if (toolkit_uses_gtk) {
-      libs += "gconf-2"
+      libs += [ "gconf-2" ]
     }
   }
   if (is_linux) {
@@ -89,7 +89,7 @@ static_library("common") {
     # 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 = [
   ]

tools/gn/secondary/crypto/BUILD.gn

@@ -137,7 +137,7 @@ component("crypto") {
   }
 
   if (use_nss) {
-    configs += "//third_party/nss:nss_linux_config"
+    configs += [ "//third_party/nss:nss_linux_config" ]
   } else {
     sources -= [
       "ec_private_key_nss.cc",

tools/gn/secondary/ipc/BUILD.gn

@@ -99,7 +99,7 @@ test("ipc_tests") {
   ]
 
   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"

tools/gn/secondary/net/BUILD.gn

@@ -1109,7 +1109,7 @@ component("net") {
   }
 
   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 @@ component("net") {
     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" ]
     }
   }
 }

tools/gn/secondary/net/third_party/nss/BUILD.gn

@@ -67,8 +67,8 @@ component("ssl") {
     "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 @@ component("ssl") {
 
   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"

tools/gn/secondary/skia/BUILD.gn

@@ -38,15 +38,15 @@ config("skia_config") {
       "//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 @@ skia_chrome_sources = [
   "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 @@ config("skia_library_config") {
       "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 @@ config("skia_library_config") {
       "//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 (component_mode == "static_library") {
     ]
 
     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 @@ if (component_mode == "static_library") {
     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 @@ if (component_mode == "static_library") {
 
     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 @@ static_library("skia_chrome_opts") {
     "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 @@ static_library("skia_opts") {
     "//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 @@ static_library("skia_opts_ssse3") {
     "//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"

tools/gn/secondary/testing/gtest/BUILD.gn

@@ -81,6 +81,6 @@ static_library("gtest") {
 
   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" ]
 }

tools/gn/secondary/third_party/expat/BUILD.gn

@@ -29,9 +29,9 @@ if (is_linux) {
 
     defines = [ "_LIB" ]
     if (is_win) {
-      defines += "COMPILED_FROM_DSP"
+      defines += [ "COMPILED_FROM_DSP" ]
     } else {
-      defines += "HAVE_EXPAT_CONFIG_H"
+      defines += [ "HAVE_EXPAT_CONFIG_H" ]
     }
   }
 }

tools/gn/secondary/third_party/icu/BUILD.gn

@@ -395,7 +395,7 @@ component("icuuc") {
   direct_dependent_configs = [ ":icu_config" ]
 
   if (!is_win) {
-    sources -= "source/stubdata/stubdata.c"
+    sources -= [ "source/stubdata/stubdata.c" ]
   }
 }
 

tools/gn/secondary/third_party/leveldatabase/BUILD.gn

@@ -15,7 +15,7 @@ config("leveldatabase_config") {
     "src/include",
   ]
   if (is_win) {
-    include_dirs += "src/port/win"
+    include_dirs += [ "src/port/win" ]
   }
 }
 
@@ -110,8 +110,8 @@ static_library("leveldatabase") {
     "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 @@ static_library("leveldatabase") {
   ]
 
   if (use_snappy) {
-    defines += "USE_SNAPPY=1"
-    deps += "//third_party/snappy"
+    defines += [ "USE_SNAPPY=1" ]
+    deps += [ "//third_party/snappy" ]
   }
 }
 
@@ -149,8 +149,8 @@ static_library("leveldb_testutil") {
   ]
 
   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 @@ test("leveldb_arena_test") {
   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 @@ test("leveldb_bloom_test") {
   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 @@ test("leveldb_cache_test") {
   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 @@ test("leveldb_corruption_test") {
   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 @@ test("leveldb_crc32c_test") {
   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 @@ test("leveldb_db_bench") {
   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 @@ test("leveldb_db_test") {
   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 @@ test("leveldb_dbformat_test") {
   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 @@ test("leveldb_env_test") {
   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 @@ test("leveldb_filename_test") {
   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 @@ test("leveldb_filter_block_test") {
   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 @@ test("leveldb_log_test") {
   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 @@ test("leveldb_skiplist_test") {
   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 @@ test("leveldb_table_test") {
   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 @@ test("leveldb_version_edit_test") {
   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 @@ test("leveldb_write_batch_test") {
   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",
   ]

tools/gn/secondary/third_party/libevent/BUILD.gn

@@ -38,6 +38,6 @@ static_library("libevent") {
     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" ]
 }

tools/gn/secondary/third_party/libusb/BUILD.gn

@@ -48,8 +48,8 @@ static_library("libusb") {
     "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 @@ static_library("libusb") {
   }
 
   if (is_mac) {
-    defines += "OS_DARWIN=1"
+    defines += [ "OS_DARWIN=1" ]
   } else {
     sources -= [
       "src/libusb/os/darwin_usb.c",
@@ -81,7 +81,7 @@ static_library("libusb") {
       "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 @@ static_library("libusb") {
   }
 
   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",

tools/gn/secondary/third_party/libxml/BUILD.gn

@@ -140,8 +140,8 @@ static_library("libxml") {
     "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" ]

tools/gn/secondary/third_party/sfntly/BUILD.gn

@@ -122,8 +122,8 @@ static_library("sfntly") {
   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" ]
 }

tools/gn/secondary/third_party/snappy/BUILD.gn

@@ -10,11 +10,11 @@ config("snappy_config") {
   # 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 @@ static_library("snappy") {
     "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 @@ test("snappy_unittest") {
     "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",

tools/gn/secondary/third_party/zlib/BUILD.gn

@@ -44,8 +44,8 @@ static_library("zlib") {
     "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 @@ static_library("minizip") {
 
   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" ]
 }