Commit bfac272b authored by brettw@chromium.org's avatar brettw@chromium.org

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
parent a3c9bdce
...@@ -674,7 +674,7 @@ component("base") { ...@@ -674,7 +674,7 @@ component("base") {
] ]
# TODO(brettw) I don't understand the conditions this file is used. # 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 -= [ sources -= [
# TODO(brettw) do these properly. # TODO(brettw) do these properly.
...@@ -752,12 +752,12 @@ component("base") { ...@@ -752,12 +752,12 @@ component("base") {
] ]
if (is_component_build) { if (is_component_build) {
sources -= "debug/debug_on_start_win.cc" sources -= [ "debug/debug_on_start_win.cc" ]
} }
} else if (!is_nacl) { } else if (!is_nacl) {
# Non-Windows. # Non-Windows.
deps += "//third_party/libevent" deps += [ "//third_party/libevent" ]
libs += "dl" libs += [ "dl" ]
} }
# Mac. # Mac.
...@@ -767,7 +767,7 @@ component("base") { ...@@ -767,7 +767,7 @@ component("base") {
"native_library_posix.cc", "native_library_posix.cc",
"strings/sys_string_conversions_posix.cc", "strings/sys_string_conversions_posix.cc",
] ]
deps += "//third_party/mach_override" deps += [ "//third_party/mach_override" ]
libs += [ libs += [
"AppKit.framework", "AppKit.framework",
"ApplicationServices.framework", "ApplicationServices.framework",
...@@ -779,7 +779,7 @@ component("base") { ...@@ -779,7 +779,7 @@ component("base") {
] ]
} else { } else {
# Non-Mac. # Non-Mac.
sources -= "files/file_path_watcher_kqueue.cc" sources -= [ "files/file_path_watcher_kqueue.cc" ]
} }
# IOS. # IOS.
...@@ -883,7 +883,7 @@ component("base_i18n") { ...@@ -883,7 +883,7 @@ component("base_i18n") {
if (toolkit_uses_gtk) { if (toolkit_uses_gtk) {
# i18n/rtl.cc uses gtk # i18n/rtl.cc uses gtk
configs += "//build/config/linux:gtk" configs += [ "//build/config/linux:gtk" ]
} }
#'conditions': [ #'conditions': [
......
...@@ -106,7 +106,7 @@ static_library("test_support_base") { ...@@ -106,7 +106,7 @@ static_library("test_support_base") {
} }
if (is_ios) { if (is_ios) {
# iOS uses its own unit test launcher. # 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 # Pull in specific Mac files for iOS (which have been filtered out
# by file name rules). # by file name rules).
...@@ -114,7 +114,7 @@ static_library("test_support_base") { ...@@ -114,7 +114,7 @@ static_library("test_support_base") {
sources += "test_file_util_mac.cc" sources += "test_file_util_mac.cc"
} }
if (toolkit_uses_gtk) { if (toolkit_uses_gtk) {
configs += "//build/config/linux:gtk" configs += [ "//build/config/linux:gtk" ]
} }
} }
...@@ -135,7 +135,7 @@ static_library("test_support_perf") { ...@@ -135,7 +135,7 @@ static_library("test_support_perf") {
direct_dependent_configs = [ ":perf_test_config" ] direct_dependent_configs = [ ":perf_test_config" ]
if (toolkit_uses_gtk) { if (toolkit_uses_gtk) {
configs += "//build/config/linux:gtk" configs += [ "//build/config/linux:gtk" ]
} }
} }
......
...@@ -15,6 +15,6 @@ static_library("symbolize") { ...@@ -15,6 +15,6 @@ static_library("symbolize") {
"utilities.h", "utilities.h",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
} }
...@@ -23,6 +23,6 @@ static_library("xdg_mime") { ...@@ -23,6 +23,6 @@ static_library("xdg_mime") {
"xdgmimeparent.h", "xdgmimeparent.h",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
} }
...@@ -328,18 +328,18 @@ if (is_win) { ...@@ -328,18 +328,18 @@ if (is_win) {
"//build/config/win:sdk", "//build/config/win:sdk",
] ]
} else if (is_clang) { } 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. # Optimizations and debug checking.
if (is_debug) { if (is_debug) {
native_compiler_configs += "//build/config:debug" native_compiler_configs += [ "//build/config:debug" ]
default_optimization_config = "//build/config/compiler:no_optimize" default_optimization_config = "//build/config/compiler:no_optimize"
} else { } else {
native_compiler_configs += "//build/config:release" native_compiler_configs += [ "//build/config:release" ]
default_optimization_config = "//build/config/compiler:optimize" default_optimization_config = "//build/config/compiler:optimize"
} }
native_compiler_configs += default_optimization_config native_compiler_configs += [ default_optimization_config ]
# Symbol setup. # Symbol setup.
if (is_clang && (is_linux || is_android)) { if (is_clang && (is_linux || is_android)) {
...@@ -357,7 +357,7 @@ if (is_clang && (is_linux || is_android)) { ...@@ -357,7 +357,7 @@ if (is_clang && (is_linux || is_android)) {
} else { } else {
assert(false, "Bad value for symbol_level.") 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. # Windows linker setup for EXEs and DLLs.
if (is_win) { if (is_win) {
...@@ -383,9 +383,9 @@ set_defaults("executable") { ...@@ -383,9 +383,9 @@ set_defaults("executable") {
if (is_win) { if (is_win) {
configs += windows_linker_configs configs += windows_linker_configs
} else if (is_mac) { } else if (is_mac) {
configs += "//build/config/mac:mac_dynamic_flags" configs += [ "//build/config/mac:mac_dynamic_flags" ]
} else if (is_linux) { } else if (is_linux) {
configs += "//build/config/linux:executable_ldconfig" configs += [ "//build/config/linux:executable_ldconfig" ]
} }
} }
...@@ -398,7 +398,7 @@ set_defaults("shared_library") { ...@@ -398,7 +398,7 @@ set_defaults("shared_library") {
if (is_win) { if (is_win) {
configs += windows_linker_configs configs += windows_linker_configs
} else if (is_mac) { } else if (is_mac) {
configs += "//build/config/mac:mac_dynamic_flags" configs += [ "//build/config/mac:mac_dynamic_flags" ]
} }
} }
......
...@@ -9,13 +9,13 @@ config("find_bad_constructs") { ...@@ -9,13 +9,13 @@ config("find_bad_constructs") {
] ]
if (is_mac) { if (is_mac) {
cflags += rebase_path( cflags += [ rebase_path(
"//third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib", "//third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
".", root_build_dir) ".", root_build_dir) ]
} else if (is_linux) { } else if (is_linux) {
cflags += rebase_path( cflags += [ rebase_path(
"//third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so", "//third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so",
".", root_build_dir) ".", root_build_dir) ]
} }
cflags += [ cflags += [
......
...@@ -53,7 +53,7 @@ config("compiler") { ...@@ -53,7 +53,7 @@ config("compiler") {
# Stack protection. # Stack protection.
if (is_mac) { if (is_mac) {
cflags += "-fstack-protector-all" cflags += [ "-fstack-protector-all" ]
} else if (is_linux) { } else if (is_linux) {
cflags += [ "-fstack-protector", "--param=ssp-buffer-size=4" ] cflags += [ "-fstack-protector", "--param=ssp-buffer-size=4" ]
} }
...@@ -70,9 +70,9 @@ config("compiler") { ...@@ -70,9 +70,9 @@ config("compiler") {
# CPU architecture. # CPU architecture.
if (cpu_arch == "x64") { if (cpu_arch == "x64") {
common_mac_flags += "-arch x86_64" common_mac_flags += [ "-arch x86_64" ]
} else if (cpu_arch == "x86") { } else if (cpu_arch == "x86") {
common_mac_flags += "-arch i386" common_mac_flags += [ "-arch i386" ]
} }
cflags += common_mac_flags + [ cflags += common_mac_flags + [
...@@ -98,11 +98,11 @@ config("compiler") { ...@@ -98,11 +98,11 @@ config("compiler") {
# CPU architecture. We may or may not be doing a cross compile now, so for # CPU architecture. We may or may not be doing a cross compile now, so for
# simplicity we always explicitly set the architecture. # simplicity we always explicitly set the architecture.
if (cpu_arch == "x64") { if (cpu_arch == "x64") {
cflags += "-m64" cflags += [ "-m64" ]
ldflags += "-m64" ldflags += [ "-m64" ]
} else if (cpu_arch == "x86") { } else if (cpu_arch == "x86") {
cflags += "-m32" cflags += [ "-m32" ]
ldflags += "-m32" ldflags += [ "-m32" ]
} else if (cpu_arch == "arm") { } else if (cpu_arch == "arm") {
# Don't set the compiler flags for the WebView build. These will come # Don't set the compiler flags for the WebView build. These will come
# from the Android build system. # from the Android build system.
...@@ -113,7 +113,7 @@ config("compiler") { ...@@ -113,7 +113,7 @@ config("compiler") {
"-mfloat-abi=$arm_float_abi", "-mfloat-abi=$arm_float_abi",
] ]
if (arm_tune != "") { if (arm_tune != "") {
cflags += "-mtune=$arm_tune" cflags += [ "-mtune=$arm_tune" ]
} }
if (arm_use_thumb) { if (arm_use_thumb) {
cflags += [ "-mthumb" ] cflags += [ "-mthumb" ]
...@@ -174,14 +174,14 @@ config("compiler") { ...@@ -174,14 +174,14 @@ config("compiler") {
} }
if (sysroot != "") { if (sysroot != "") {
cflags += "--sysroot=" + sysroot cflags += [ "--sysroot=" + sysroot ]
ldflags += "--sysroot=" + sysroot ldflags += [ "--sysroot=" + sysroot ]
# Need to get some linker flags out of the 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), [rebase_path("../../linux/sysroot_ld_path.sh", ".", root_build_dir),
sysroot], sysroot],
"value") "value") ]
} }
ldflags += [ ldflags += [
......
...@@ -61,9 +61,9 @@ config("sdk_link") { ...@@ -61,9 +61,9 @@ config("sdk_link") {
"$visual_studio_path\VC\lib", "$visual_studio_path\VC\lib",
"$visual_studio_path\VC\atlmfc\lib", "$visual_studio_path\VC\atlmfc\lib",
] ]
#if (!is_asan) { TODO(brettw) Address Sanitizer if (!is_asan) {
# ldflags += "/largeaddressaware" ldflags += [ "/largeaddressaware" ]
#} }
} }
} }
......
...@@ -53,8 +53,8 @@ static_library("libpng") { ...@@ -53,8 +53,8 @@ static_library("libpng") {
"pngwutil.c", "pngwutil.c",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
forward_dependent_configs_from = [ "//third_party/zlib" ] forward_dependent_configs_from = [ "//third_party/zlib" ]
......
...@@ -59,8 +59,8 @@ static_library("re2") { ...@@ -59,8 +59,8 @@ static_library("re2") {
"util/util.h", "util/util.h",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
direct_dependent_configs = [ ":re2_config" ] direct_dependent_configs = [ ":re2_config" ]
deps = [ deps = [
...@@ -70,6 +70,6 @@ static_library("re2") { ...@@ -70,6 +70,6 @@ static_library("re2") {
if (is_win) { if (is_win) {
include_dirs = [ "mswin" ] include_dirs = [ "mswin" ]
} else { } else {
sources -= "mswin/stdint.h" sources -= [ "mswin/stdint.h" ]
} }
} }
...@@ -177,7 +177,7 @@ executable("gn") { ...@@ -177,7 +177,7 @@ executable("gn") {
] ]
if (!is_gyp) { if (!is_gyp) {
# Currently this only works in GYP (see GN_BUILD above). # Currently this only works in GYP (see GN_BUILD above).
deps += "//build/util:last_change" deps += [ "//build/util:last_change" ]
} }
} }
......
...@@ -51,7 +51,7 @@ executable("chrome") { ...@@ -51,7 +51,7 @@ executable("chrome") {
# TODO(brettw) this isn't right for all platforms. # TODO(brettw) this isn't right for all platforms.
if (!use_aura) { if (!use_aura) {
sources -= "app/chrome_exe_main_aura.cc" sources -= [ "app/chrome_exe_main_aura.cc" ]
} }
if (!is_win) { if (!is_win) {
...@@ -68,7 +68,7 @@ static_library("browser") { ...@@ -68,7 +68,7 @@ static_library("browser") {
if (is_linux) { if (is_linux) {
libs = [ "dl" ] libs = [ "dl" ]
if (toolkit_uses_gtk) { if (toolkit_uses_gtk) {
libs += "gconf-2" libs += [ "gconf-2" ]
} }
} }
if (is_linux) { if (is_linux) {
...@@ -89,7 +89,7 @@ static_library("common") { ...@@ -89,7 +89,7 @@ static_library("common") {
# common/net uses NSS. # common/net uses NSS.
# TODO(brettw) have a better way to express this without having to do # TODO(brettw) have a better way to express this without having to do
# "if (use_nss)" everywhere. # "if (use_nss)" everywhere.
configs += "//third_party/nss:nss_linux_config" configs += [ "//third_party/nss:nss_linux_config" ]
} }
deps = [ deps = [
] ]
......
...@@ -137,7 +137,7 @@ component("crypto") { ...@@ -137,7 +137,7 @@ component("crypto") {
} }
if (use_nss) { if (use_nss) {
configs += "//third_party/nss:nss_linux_config" configs += [ "//third_party/nss:nss_linux_config" ]
} else { } else {
sources -= [ sources -= [
"ec_private_key_nss.cc", "ec_private_key_nss.cc",
......
...@@ -99,7 +99,7 @@ test("ipc_tests") { ...@@ -99,7 +99,7 @@ test("ipc_tests") {
] ]
if (is_win || is_ios) { 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") { #if (is_android && gtest_target_type == "shared_library") {
# deps += "/testing/android/native_test.gyp:native_testNative_code" # deps += "/testing/android/native_test.gyp:native_testNative_code"
......
...@@ -1109,7 +1109,7 @@ component("net") { ...@@ -1109,7 +1109,7 @@ component("net") {
} }
if (is_linux && use_nss) { if (is_linux && use_nss) {
configs += "//third_party/nss:nss_linux_config" configs += [ "//third_party/nss:nss_linux_config" ]
} }
if (is_chromeos) { if (is_chromeos) {
...@@ -1190,9 +1190,9 @@ component("net") { ...@@ -1190,9 +1190,9 @@ component("net") {
posix_avoid_mmap = false # TODO(brettw) should be true on 32-bit Android. posix_avoid_mmap = false # TODO(brettw) should be true on 32-bit Android.
if (posix_avoid_mmap) { if (posix_avoid_mmap) {
defines = [ "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 } else { # !posix_avoid_mmap
sources -= "disk_cache/mapped_file_avoid_mmap_posix.cc" sources -= [ "disk_cache/mapped_file_avoid_mmap_posix.cc" ]
} }
} }
} }
......
...@@ -67,8 +67,8 @@ component("ssl") { ...@@ -67,8 +67,8 @@ component("ssl") {
"USE_UTIL_DIRECTLY", "USE_UTIL_DIRECTLY",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
direct_dependent_configs = [ ":ssl_config" ] direct_dependent_configs = [ ":ssl_config" ]
...@@ -86,7 +86,7 @@ component("ssl") { ...@@ -86,7 +86,7 @@ component("ssl") {
if (is_linux) { if (is_linux) {
include_dirs = [ "bodge" ] include_dirs = [ "bodge" ]
configs += "//third_party/nss:nss_linux_config" configs += [ "//third_party/nss:nss_linux_config" ]
} }
if (is_mac) { if (is_mac) {
sources -= "ssl/bodge/secitem_array.c" sources -= "ssl/bodge/secitem_array.c"
......
...@@ -38,15 +38,15 @@ config("skia_config") { ...@@ -38,15 +38,15 @@ config("skia_config") {
"//third_party/skia/include/gpu", "//third_party/skia/include/gpu",
"//third_party/skia/src/gpu", "//third_party/skia/src/gpu",
] ]
defines += "SK_SUPPORT_GPU=1" defines += [ "SK_SUPPORT_GPU=1" ]
} else { } else {
defines += "SK_SUPPORT_GPU=0" defines += [ "SK_SUPPORT_GPU=0" ]
} }
# For POSIX platforms, prefer the Mutex implementation provided by Skia # For POSIX platforms, prefer the Mutex implementation provided by Skia
# since it does not generate static initializers. # since it does not generate static initializers.
if (is_posix) { if (is_posix) {
defines += "SK_USE_POSIX_THREADS" defines += [ "SK_USE_POSIX_THREADS" ]
} }
if (is_android) { if (is_android) {
...@@ -111,13 +111,13 @@ skia_chrome_sources = [ ...@@ -111,13 +111,13 @@ skia_chrome_sources = [
"ext/vector_platform_device_skia.h", "ext/vector_platform_device_skia.h",
] ]
if (is_posix) { if (is_posix) {
skia_chrome_sources -= "ext/SkThread_chrome.cc" skia_chrome_sources -= [ "ext/SkThread_chrome.cc" ]
} }
if (is_ios) { if (is_ios) {
skia_chrome_sources -= "ext/vector_platform_device_skia.cc" skia_chrome_sources -= [ "ext/vector_platform_device_skia.cc" ]
} }
if (is_win) { if (is_win) {
skia_chrome_sources -= "ext/SkThread_chrome.cc" skia_chrome_sources -= [ "ext/SkThread_chrome.cc" ]
} }
if (is_android && !enable_printing) { if (is_android && !enable_printing) {
skia_chrome_sources -= [ skia_chrome_sources -= [
...@@ -179,7 +179,7 @@ config("skia_library_config") { ...@@ -179,7 +179,7 @@ config("skia_library_config") {
"SK_DEFAULT_FONT_CACHE_LIMIT=1048576" # 1024 * 1024 "SK_DEFAULT_FONT_CACHE_LIMIT=1048576" # 1024 * 1024
] ]
} else { } else {
defines += "SK_DEFAULT_FONT_CACHE_LIMIT=20971520" # 20 * 1024 * 1024 defines += [ "SK_DEFAULT_FONT_CACHE_LIMIT=20971520" ] # 20 * 1024 * 1024
} }
if (is_win) { if (is_win) {
...@@ -188,7 +188,7 @@ config("skia_library_config") { ...@@ -188,7 +188,7 @@ config("skia_library_config") {
"//third_party/skia/src/utils/win", "//third_party/skia/src/utils/win",
] ]
defines += "SK_FONTHOST_USES_FONTMGR" defines += [ "SK_FONTHOST_USES_FONTMGR" ]
cflags = [ cflags = [
# TODO(brettw) comment what these are. # TODO(brettw) comment what these are.
...@@ -1122,12 +1122,12 @@ if (component_mode == "static_library") { ...@@ -1122,12 +1122,12 @@ if (component_mode == "static_library") {
] ]
if (skia_support_pdf) { if (skia_support_pdf) {
deps += "//third_party/sfntly" deps += [ "//third_party/sfntly" ]
} else { } else {
# TODO(brettw) remove PDF sources. # TODO(brettw) remove PDF sources.
} }
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ configs += [
":skia_config", ":skia_config",
":skia_library_config", ":skia_library_config",
...@@ -1154,7 +1154,7 @@ if (component_mode == "static_library") { ...@@ -1154,7 +1154,7 @@ if (component_mode == "static_library") {
external = true external = true
sources = skia_chrome_sources sources = skia_chrome_sources
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ configs += [
":skia_config", ":skia_config",
"//build/config/compiler:no_chromium_code", "//build/config/compiler:no_chromium_code",
...@@ -1203,7 +1203,7 @@ if (component_mode == "static_library") { ...@@ -1203,7 +1203,7 @@ if (component_mode == "static_library") {
defines = [ "SKIA_IMPLEMENTATION=1", ] defines = [ "SKIA_IMPLEMENTATION=1", ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ configs += [
":skia_config", ":skia_config",
":skia_library_config", ":skia_library_config",
...@@ -1251,7 +1251,7 @@ static_library("skia_chrome_opts") { ...@@ -1251,7 +1251,7 @@ static_library("skia_chrome_opts") {
"ext/convolver_SSE2.cc", "ext/convolver_SSE2.cc",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ configs += [
":skia_config", ":skia_config",
"//build/config/compiler:no_chromium_code" "//build/config/compiler:no_chromium_code"
...@@ -1279,7 +1279,7 @@ static_library("skia_opts") { ...@@ -1279,7 +1279,7 @@ static_library("skia_opts") {
"//third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp", "//third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ configs += [
":skia_config", ":skia_config",
"//build/config/compiler:no_chromium_code" "//build/config/compiler:no_chromium_code"
...@@ -1296,7 +1296,7 @@ static_library("skia_opts_ssse3") { ...@@ -1296,7 +1296,7 @@ static_library("skia_opts_ssse3") {
"//third_party/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp", "//third_party/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ configs += [
":skia_config", ":skia_config",
"//build/config/compiler:no_chromium_code" "//build/config/compiler:no_chromium_code"
......
...@@ -81,6 +81,6 @@ static_library("gtest") { ...@@ -81,6 +81,6 @@ static_library("gtest") {
all_dependent_configs = [ ":gtest_config" ] all_dependent_configs = [ ":gtest_config" ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
} }
...@@ -29,9 +29,9 @@ if (is_linux) { ...@@ -29,9 +29,9 @@ if (is_linux) {
defines = [ "_LIB" ] defines = [ "_LIB" ]
if (is_win) { if (is_win) {
defines += "COMPILED_FROM_DSP" defines += [ "COMPILED_FROM_DSP" ]
} else { } else {
defines += "HAVE_EXPAT_CONFIG_H" defines += [ "HAVE_EXPAT_CONFIG_H" ]
} }
} }
} }
...@@ -395,7 +395,7 @@ component("icuuc") { ...@@ -395,7 +395,7 @@ component("icuuc") {
direct_dependent_configs = [ ":icu_config" ] direct_dependent_configs = [ ":icu_config" ]
if (!is_win) { if (!is_win) {
sources -= "source/stubdata/stubdata.c" sources -= [ "source/stubdata/stubdata.c" ]
} }
} }
......
...@@ -15,7 +15,7 @@ config("leveldatabase_config") { ...@@ -15,7 +15,7 @@ config("leveldatabase_config") {
"src/include", "src/include",
] ]
if (is_win) { if (is_win) {
include_dirs += "src/port/win" include_dirs += [ "src/port/win" ]
} }
} }
...@@ -110,8 +110,8 @@ static_library("leveldatabase") { ...@@ -110,8 +110,8 @@ static_library("leveldatabase") {
"src/util/status.cc", "src/util/status.cc",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
direct_dependent_configs = [ ":leveldatabase_config" ] direct_dependent_configs = [ ":leveldatabase_config" ]
...@@ -122,8 +122,8 @@ static_library("leveldatabase") { ...@@ -122,8 +122,8 @@ static_library("leveldatabase") {
] ]
if (use_snappy) { if (use_snappy) {
defines += "USE_SNAPPY=1" defines += [ "USE_SNAPPY=1" ]
deps += "//third_party/snappy" deps += [ "//third_party/snappy" ]
} }
} }
...@@ -149,8 +149,8 @@ static_library("leveldb_testutil") { ...@@ -149,8 +149,8 @@ static_library("leveldb_testutil") {
] ]
forward_dependent_configs_from = [ ":leveldatabase" ] forward_dependent_configs_from = [ ":leveldatabase" ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ deps = [
":leveldatabase", ":leveldatabase",
...@@ -162,8 +162,8 @@ test("leveldb_arena_test") { ...@@ -162,8 +162,8 @@ test("leveldb_arena_test") {
sources = [ sources = [
"src/util/arena_test.cc", "src/util/arena_test.cc",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ deps = [
":leveldb_testutil", ":leveldb_testutil",
] ]
...@@ -173,8 +173,8 @@ test("leveldb_bloom_test") { ...@@ -173,8 +173,8 @@ test("leveldb_bloom_test") {
sources = [ sources = [
"src/util/bloom_test.cc", "src/util/bloom_test.cc",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ deps = [
":leveldb_testutil", ":leveldb_testutil",
] ]
...@@ -184,8 +184,8 @@ test("leveldb_cache_test") { ...@@ -184,8 +184,8 @@ test("leveldb_cache_test") {
sources = [ sources = [
"src/util/cache_test.cc", "src/util/cache_test.cc",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ deps = [
":leveldb_testutil", ":leveldb_testutil",
] ]
...@@ -195,8 +195,8 @@ test("leveldb_corruption_test") { ...@@ -195,8 +195,8 @@ test("leveldb_corruption_test") {
sources = [ sources = [
"src/db/corruption_test.cc", "src/db/corruption_test.cc",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ deps = [
":leveldb_testutil", ":leveldb_testutil",
] ]
...@@ -206,8 +206,8 @@ test("leveldb_crc32c_test") { ...@@ -206,8 +206,8 @@ test("leveldb_crc32c_test") {
sources = [ sources = [
"src/util/crc32c_test.cc" "src/util/crc32c_test.cc"
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ deps = [
":leveldb_testutil", ":leveldb_testutil",
] ]
...@@ -217,8 +217,8 @@ test("leveldb_db_bench") { ...@@ -217,8 +217,8 @@ test("leveldb_db_bench") {
sources = [ sources = [
"src/db/db_bench.cc", "src/db/db_bench.cc",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ deps = [
":leveldb_testutil", ":leveldb_testutil",
] ]
...@@ -228,8 +228,8 @@ test("leveldb_db_test") { ...@@ -228,8 +228,8 @@ test("leveldb_db_test") {
sources = [ sources = [
"src/db/db_test.cc", "src/db/db_test.cc",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ deps = [
":leveldb_testutil", ":leveldb_testutil",
] ]
...@@ -239,8 +239,8 @@ test("leveldb_dbformat_test") { ...@@ -239,8 +239,8 @@ test("leveldb_dbformat_test") {
sources = [ sources = [
"src/db/dbformat_test.cc", "src/db/dbformat_test.cc",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ deps = [
":leveldb_testutil", ":leveldb_testutil",
] ]
...@@ -250,8 +250,8 @@ test("leveldb_env_test") { ...@@ -250,8 +250,8 @@ test("leveldb_env_test") {
sources = [ sources = [
"src/util/env_test.cc", "src/util/env_test.cc",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ deps = [
":leveldb_testutil", ":leveldb_testutil",
] ]
...@@ -261,8 +261,8 @@ test("leveldb_filename_test") { ...@@ -261,8 +261,8 @@ test("leveldb_filename_test") {
sources = [ sources = [
"src/db/filename_test.cc", "src/db/filename_test.cc",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ deps = [
":leveldb_testutil", ":leveldb_testutil",
] ]
...@@ -272,8 +272,8 @@ test("leveldb_filter_block_test") { ...@@ -272,8 +272,8 @@ test("leveldb_filter_block_test") {
sources = [ sources = [
"src/table/filter_block_test.cc", "src/table/filter_block_test.cc",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ deps = [
":leveldb_testutil", ":leveldb_testutil",
] ]
...@@ -283,8 +283,8 @@ test("leveldb_log_test") { ...@@ -283,8 +283,8 @@ test("leveldb_log_test") {
sources = [ sources = [
"src/db/log_test.cc", "src/db/log_test.cc",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ deps = [
":leveldb_testutil", ":leveldb_testutil",
] ]
...@@ -294,8 +294,8 @@ test("leveldb_skiplist_test") { ...@@ -294,8 +294,8 @@ test("leveldb_skiplist_test") {
sources = [ sources = [
"src/db/skiplist_test.cc", "src/db/skiplist_test.cc",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ deps = [
":leveldb_testutil", ":leveldb_testutil",
] ]
...@@ -305,8 +305,8 @@ test("leveldb_table_test") { ...@@ -305,8 +305,8 @@ test("leveldb_table_test") {
sources = [ sources = [
"src/table/table_test.cc", "src/table/table_test.cc",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ deps = [
":leveldb_testutil", ":leveldb_testutil",
] ]
...@@ -316,8 +316,8 @@ test("leveldb_version_edit_test") { ...@@ -316,8 +316,8 @@ test("leveldb_version_edit_test") {
sources = [ sources = [
"src/db/version_edit_test.cc", "src/db/version_edit_test.cc",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ deps = [
":leveldb_testutil", ":leveldb_testutil",
] ]
...@@ -327,8 +327,8 @@ test("leveldb_write_batch_test") { ...@@ -327,8 +327,8 @@ test("leveldb_write_batch_test") {
sources = [ sources = [
"src/db/write_batch_test.cc", "src/db/write_batch_test.cc",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ deps = [
":leveldb_testutil", ":leveldb_testutil",
] ]
......
...@@ -38,6 +38,6 @@ static_library("libevent") { ...@@ -38,6 +38,6 @@ static_library("libevent") {
sources -= [ "kqueue.c" ] sources -= [ "kqueue.c" ]
} }
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
} }
...@@ -48,8 +48,8 @@ static_library("libusb") { ...@@ -48,8 +48,8 @@ static_library("libusb") {
"src/libusb/os", "src/libusb/os",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
direct_dependent_configs = [ ":libusb_config" ] direct_dependent_configs = [ ":libusb_config" ]
...@@ -66,7 +66,7 @@ static_library("libusb") { ...@@ -66,7 +66,7 @@ static_library("libusb") {
} }
if (is_mac) { if (is_mac) {
defines += "OS_DARWIN=1" defines += [ "OS_DARWIN=1" ]
} else { } else {
sources -= [ sources -= [
"src/libusb/os/darwin_usb.c", "src/libusb/os/darwin_usb.c",
...@@ -81,7 +81,7 @@ static_library("libusb") { ...@@ -81,7 +81,7 @@ static_library("libusb") {
"USE_UDEV=1", "USE_UDEV=1",
"_GNU_SOURCE=1", "_GNU_SOURCE=1",
] ]
configs += "//build/config/linux:udev" configs += [ "//build/config/linux:udev" ]
} else { } else {
sources -= [ sources -= [
"src/libusb/os/linux_udev.c", "src/libusb/os/linux_udev.c",
...@@ -91,9 +91,9 @@ static_library("libusb") { ...@@ -91,9 +91,9 @@ static_library("libusb") {
} }
if (is_win) { if (is_win) {
include_dirs += "src/msvc" include_dirs += [ "src/msvc" ]
} else { } else {
include_dirs += "src" include_dirs += [ "src" ]
sources -= [ sources -= [
"src/libusb/os/poll_windows.c", "src/libusb/os/poll_windows.c",
"src/libusb/os/poll_windows.h", "src/libusb/os/poll_windows.h",
......
...@@ -140,8 +140,8 @@ static_library("libxml") { ...@@ -140,8 +140,8 @@ static_library("libxml") {
"win32/include/libxml/xmlversion.h", "win32/include/libxml/xmlversion.h",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
direct_dependent_configs = [ ":libxml_config" ] direct_dependent_configs = [ ":libxml_config" ]
forward_dependent_configs_from = [ "//third_party/icu:icuuc" ] forward_dependent_configs_from = [ "//third_party/icu:icuuc" ]
......
...@@ -122,8 +122,8 @@ static_library("sfntly") { ...@@ -122,8 +122,8 @@ static_library("sfntly") {
defines = [ "SFNTLY_NO_EXCEPTION" ] defines = [ "SFNTLY_NO_EXCEPTION" ]
include_dirs = [ "cpp/src" ] include_dirs = [ "cpp/src" ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ "//third_party/icu:icuuc" ] deps = [ "//third_party/icu:icuuc" ]
} }
...@@ -10,11 +10,11 @@ config("snappy_config") { ...@@ -10,11 +10,11 @@ config("snappy_config") {
# These OS-specific generated headers were made by running the configure # These OS-specific generated headers were made by running the configure
# script offline. # script offline.
if (is_win) { if (is_win) {
include_dirs += "win32" include_dirs += [ "win32" ]
} else if (is_mac) { } else if (is_mac) {
include_dirs += "mac" include_dirs += [ "mac" ]
} else { } else {
include_dirs += "linux" include_dirs += [ "linux" ]
} }
} }
...@@ -29,8 +29,8 @@ static_library("snappy") { ...@@ -29,8 +29,8 @@ static_library("snappy") {
"src/snappy.h", "src/snappy.h",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
direct_dependent_configs = [ ":snappy_config" ] direct_dependent_configs = [ ":snappy_config" ]
#['OS=="win"', { #['OS=="win"', {
...@@ -60,8 +60,8 @@ test("snappy_unittest") { ...@@ -60,8 +60,8 @@ test("snappy_unittest") {
"src/snappy_unittest.cc", "src/snappy_unittest.cc",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [ deps = [
":snappy", ":snappy",
......
...@@ -44,8 +44,8 @@ static_library("zlib") { ...@@ -44,8 +44,8 @@ static_library("zlib") {
"zutil.h", "zutil.h",
] ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
direct_dependent_configs = [ ":zlib_config" ] direct_dependent_configs = [ ":zlib_config" ]
} }
...@@ -81,8 +81,8 @@ static_library("minizip") { ...@@ -81,8 +81,8 @@ static_library("minizip") {
deps = [ ":zlib" ] deps = [ ":zlib" ]
configs -= "//build/config/compiler:chromium_code" configs -= [ "//build/config/compiler:chromium_code" ]
configs += "//build/config/compiler:no_chromium_code" configs += [ "//build/config/compiler:no_chromium_code" ]
direct_dependent_configs = [ ":zlib_config" ] direct_dependent_configs = [ ":zlib_config" ]
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment