4 files changed, 27 insertions, 27 deletions

diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 791074f..9239c24 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/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" ]
   }
 }
 
diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn
index 46bf985..202b195f9 100644
--- a/build/config/clang/BUILD.gn
+++ b/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 += [
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 25b0759..8a8ba2e 100644
--- a/build/config/compiler/BUILD.gn
+++ b/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 += [
diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn
index a4aaa25..ffc5d1c 100644
--- a/build/config/win/BUILD.gn
+++ b/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" ]
+    }
   }
 }