diff options
25 files changed, 229 insertions, 1583 deletions
diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn index 1d58f86..1dfbfe7 100644 --- a/build/config/BUILD.gn +++ b/build/config/BUILD.gn @@ -102,11 +102,10 @@ config("feature_flags") { if (use_glib) { defines += [ "USE_GLIB=1" ] } - if (use_nss) { - defines += [ "USE_NSS=1" ] - } if (use_openssl) { defines += [ "USE_OPENSSL=1" ] + } else { + defines += [ "USE_NSS=1" ] } if (use_ozone) { defines += [ "USE_OZONE=1" ] diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn index 280fccd..7f80595 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -42,10 +42,6 @@ declare_args() { # the default toolchain to 64-bit. force_win64 = false - # Set to true on the command line when invoked by GYP. Build files can key - # off of this to make any GYP-output-specific changes to the build. - is_gyp = false - # Selects the desired build flavor. Official builds get additional # processing to prepare for release. Normally you will want to develop and # test with this flag off. @@ -67,13 +63,6 @@ declare_args() { # Compile for Thread Sanitizer to find threading bugs. is_tsan = false - - # When running in gyp-generating mode, this is the root of the build tree. - gyp_output_dir = "out" - - # When running in gyp-generating mode, this flag indicates if the current GYP - # generator is xcode. Can only be true when building for iOS). - is_gyp_xcode_generator = false } # ============================================================================= @@ -365,7 +354,10 @@ if (!is_win) { native_compiler_configs += [ "//build/config/gcc:symbol_visibility_hidden" ] } if (is_clang) { - native_compiler_configs += [ "//build/config/clang:find_bad_constructs" ] + native_compiler_configs += [ + "//build/config/clang:find_bad_constructs", + "//build/config/clang:extra_warnings", + ] } # Optimizations and debug checking. diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn index a0392d2..f10fde7 100644 --- a/build/config/clang/BUILD.gn +++ b/build/config/clang/BUILD.gn @@ -31,3 +31,14 @@ config("find_bad_constructs") { ] } } + +# Enables some extra Clang-specific warnings. Some third-party code won't +# compile with these so may want to remove this config. +config("extra_warnings") { + cflags = [ + "-Wheader-hygiene" + + # Warns when a const char[] is converted to bool. + "-Wstring-conversion", + ] +} diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index ac00477..c492356 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -517,12 +517,8 @@ config("default_warnings") { ] } - # TODO(brettw) Ones below here should be clang-only when we have a flag - # for it. if (is_clang) { cflags += [ - "-Wheader-hygiene", - # This warns on using ints as initializers for floats in # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|), # which happens in several places in chrome code. Not sure if @@ -545,9 +541,6 @@ config("default_warnings") { # Clang spots more unused functions. "-Wno-unused-function", - - # Warns when a const char[] is converted to bool. - "-Wstring-conversion", ] } diff --git a/build/config/crypto.gni b/build/config/crypto.gni index f3d8590..44e5bc9 100644 --- a/build/config/crypto.gni +++ b/build/config/crypto.gni @@ -12,9 +12,3 @@ declare_args() { # code, and is experimental in other cases (see http://crbug.com/62803). use_openssl = is_android || is_nacl } - -if (is_linux && !use_openssl) { - use_nss = true -} else { - use_nss = false -} diff --git a/build/config/ios/ios_sdk.gni b/build/config/ios/ios_sdk.gni index e6c3e12..6b81a03 100644 --- a/build/config/ios/ios_sdk.gni +++ b/build/config/ios/ios_sdk.gni @@ -11,19 +11,12 @@ declare_args() { # target is for running on the device. The default value is to use the # Simulator except when targeting GYP's Xcode builds (for compat with the # existing GYP build). - use_ios_simulator = !is_gyp_xcode_generator + use_ios_simulator = true # Version of iOS that we're targeting. ios_deployment_target = "6.0" } -# Simulator flag explicitly passed in. -if (!is_gyp_xcode_generator) { - # The Ninja build currently only targets the simulator. - assert(use_ios_simulator, - "You can't do an iOS device build using Ninja yet.") -} - if (ios_sdk_path == "") { # Compute default target. if (use_ios_simulator) { diff --git a/build/toolchain/android/BUILD.gn b/build/toolchain/android/BUILD.gn index 8f84f69..bdf2632 100644 --- a/build/toolchain/android/BUILD.gn +++ b/build/toolchain/android/BUILD.gn @@ -16,64 +16,6 @@ if (build_cpu_arch == "x64") { assert(false, "Need Android toolchain support for your build OS.") } -if (is_gyp) { - # Set the compilers for GYP to use. This logic is only relevant to GYP where - # there is "a" target compiler. In native GN builds, we have separate - # compilers for the toolchains below, any or all of which could be active in - # any given build. - if (is_clang) { - # Set the GYP header for all toolchains when running under Clang. - make_global_settings = make_clang_global_settings - } else { - # Find the compiler for GYP for non-Clang Android. - if (cpu_arch == "x86") { - android_toolchain_arch = "x86-4.6" - } else if (cpu_arch == "arm") { - android_toolchain_arch = "arm-linux-androideabi-4.6" - } else if (cpu_arch == "mipsel") { - android_toolchain_arch = "mipsel-linux-android-4.6" - } else { - assert(false, "Need Android toolchain support for your platform.") - } - - # The extra slash before "toolchains" is because GYP generates this and we - # have to match the make_global_settings character-for-character, - # TODO(brettw) remove extra slash before toolchains when GYP compat is no - # longer necessary. - android_toolchain = - "$android_ndk_root//toolchains/$android_toolchain_arch/prebuilt/$build_os-$android_host_arch/bin" - - # This script will find the compilers for the given Android toolchain - # directory. - android_compilers = exec_script("find_android_compiler.py", - [android_toolchain], "value") - make_global_settings = - "['CC', '" + android_compilers[0] + "']," + - "['CXX', '" + android_compilers[1] + "']," + - "['CC.host', '" + android_compilers[2] + "']," + - "['CXX.host', '" + android_compilers[3] + "']," - } - - if (use_goma) { - # There is a TODO(yyanagisawa) in common.gypi about the make generator not - # supporting CC_wrapper without CC. As a result, we must add a condition - # when on the generator when we're not explicitly setting the variables - # above (which happens when gyp_header is empty at this point). - # - # GYP will interpret the file once for each generator, so we have to write - # this condition into the GYP file since the user could have more than one - # generator set. - gyp_header = - "'conditions': [" + - "['\"<(GENERATOR)\"==\"ninja\"', { 'make_global_settings': [" + - make_global_settings + - make_goma_global_settings + - "]}]]," - } else { - gyp_header = "'make_global_settings': [" + make_global_settings + "]," - } -} - gcc_toolchain("x86") { prefix = "$android_ndk_root/toolchains/x86-4.6/prebuilt/$build_os-$android_host_arch/bin/i686-linux-android-" cc = prefix + "gcc" diff --git a/build/toolchain/clang.gni b/build/toolchain/clang.gni index 861a681..c680384 100644 --- a/build/toolchain/clang.gni +++ b/build/toolchain/clang.gni @@ -7,30 +7,3 @@ declare_args() { # with the allocation type. use_clang_type_profiler = false } - -if (is_clang) { - # Define "make_clang_dir" which is the directory relative to the source root - # of the clang directory we're using. This is used for defining the header - # for GYP so it must match the directory format of GYP (rather than using - # GN-style "//..." paths). - if (is_linux && use_clang_type_profiler) { - if (cpu_arch == "x64") { - make_clang_dir = "third_party/llvm-allocated-type/Linux_x64" - } else { - # 32-bit Clang is unsupported. It may not build. Put your 32-bit Clang in - # this directory at your own risk if needed for some purpose (e.g. to - # compare 32-bit and 64-bit behavior like memory usage). Any failure by - # this compiler should not close the tree. - make_clang_dir = "third_party/llvm-allocated-type/Linux_ia32" - } - } else { - make_clang_dir = "third_party/llvm-build/Release+Asserts" - } - - # This includes the array values but not the 'make_global_settings' name. - make_clang_global_settings = - "['CC', '$make_clang_dir/bin/clang']," + - "['CXX', '$make_clang_dir/bin/clang++']," + - "['CC.host', '\$(CC)']," + - "['CXX.host', '\$(CXX)']," -} diff --git a/build/toolchain/linux/BUILD.gn b/build/toolchain/linux/BUILD.gn index 62e7278..dd98cb4 100644 --- a/build/toolchain/linux/BUILD.gn +++ b/build/toolchain/linux/BUILD.gn @@ -7,46 +7,6 @@ import("//build/toolchain/clang.gni") import("//build/toolchain/gcc_toolchain.gni") import("//build/toolchain/goma.gni") -if (is_gyp) { - # Set the compilers for GYP to use. This logic is only relevant to GYP where - # there is "a" target compiler. In native GN builds, we have separate - # compilers for the toolchains below, any or all of which could be active in - # any given build. - if (is_clang) { - # Set the GYP header for all toolchains when running under Clang. - make_global_settings = make_clang_global_settings - } else { - if (cpu_arch == "mipsel") { - make_global_settings = - "['CC', '$sysroot/../bin/mipsel-linux-gnu-gcc']," + - "['CXX', '$sysroot/../bin/mipsel-linux-gnu-g++']," + - "['CC.host', '/usr/bin/gcc']," + - "['CXX.host', '/usr/bin/g++']," - } else { - make_global_settings = "" - } - } - - if (use_goma) { - # There is a TODO(yyanagisawa) in common.gypi about the make generator not - # supporting CC_wrapper without CC. As a result, we must add a condition - # when on the generator when we're not explicitly setting the variables - # above (which happens when gyp_header is empty at this point). - # - # GYP will interpret the file once for each generator, so we have to write - # this condition into the GYP file since the user could have more than one - # generator set. - gyp_header = - "'conditions':" + - "[['\"<(GENERATOR)\"==\"ninja\"', { 'make_global_settings': [" + - make_global_settings + - make_goma_global_settings + - "]}]]," - } else { - gyp_header = "'make_global_settings': [" + make_global_settings + "]," - } -} - gcc_toolchain("arm") { cc = "arm-linux-gnueabi-gcc" cxx = "arm-linux-gnueabi-g++" diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn index 8613d1f..c9a58b4b 100644 --- a/build/toolchain/mac/BUILD.gn +++ b/build/toolchain/mac/BUILD.gn @@ -19,30 +19,6 @@ if (is_clang) { root_build_dir) cxx = rebase_path("//third_party/llvm-build/Release+Asserts/bin/clang++", root_build_dir) - - # Set the GYP header for all toolchains when running under Clang. - if (is_gyp) { - make_global_settings = make_clang_global_settings - - if (use_goma) { - # There is a TODO(yyanagisawa) in common.gypi about the make generator not - # supporting CC_wrapper without CC. As a result, we must add a condition - # when on the generator when we're not explicitly setting the variables - # above (which happens when gyp_header is empty at this point). - # - # GYP will interpret the file once for each generator, so we have to write - # this condition into the GYP file since the user could have more than one - # generator set. - gyp_header = - "'conditions':" + - "[['\"<(GENERATOR)\"==\"ninja\"', { 'make_global_settings': [" + - make_global_settings + - make_goma_global_settings + - "]}]]," - } else { - gyp_header = "'make_global_settings': [" + make_global_settings + "]," - } - } } else { cc = "gcc" cxx = "g++" diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn index 5b9ae48..04b36cf 100644 --- a/build/toolchain/win/BUILD.gn +++ b/build/toolchain/win/BUILD.gn @@ -22,11 +22,6 @@ exec_script("setup_toolchain.py", stamp_command = "$python_path gyp-win-tool stamp \$out" copy_command = "$python_path gyp-win-tool recursive-mirror \$in \$out" -if (use_goma) { - # Add the Goma compiler prefixes to the GYP file. - gyp_header = "'make_global_settings': [ $make_goma_global_settings ]," -} - # 32-bit toolchain ------------------------------------------------------------- toolchain("32") { diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn index 455169c..1f31f8b 100644 --- a/crypto/BUILD.gn +++ b/crypto/BUILD.gn @@ -106,17 +106,11 @@ component("crypto") { ] } - if (!is_linux) { + if (use_openssl || !is_linux) { sources -= [ "openpgp_symmetric_encryption.cc", "openpgp_symmetric_encryption.h", ] - if (use_nss) { # Removed for non-NSS in all cases below. - sources -= [ - "openpgp_symmetric_encryption.cc", - "openpgp_symmetric_encryption.h", - ] - } } if (!is_mac) { sources -= [ @@ -133,7 +127,8 @@ component("crypto") { ] } - if (!use_nss) { + if (use_openssl) { + # Remove NSS files when using OpenSSL sources -= [ "ec_private_key_nss.cc", "ec_signature_creator_nss.cc", @@ -153,8 +148,8 @@ component("crypto") { "third_party/nss/rsawrapr.c", "third_party/nss/secsign.cc", ] - } - if (!use_openssl) { + } else { + # Remove OpenSSL when using NSS. sources -= [ "ec_private_key_openssl.cc", "ec_signature_creator_openssl.cc", diff --git a/net/BUILD.gn b/net/BUILD.gn index ce95a3c..cde05e2 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -281,7 +281,7 @@ component("net") { ] } - if (!use_nss) { + if (use_openssl) { sources -= [ "cert/cert_verify_proc_nss.cc", "cert/cert_verify_proc_nss.h", @@ -396,19 +396,15 @@ component("net") { } if (is_mac) { - sources -= [ - "ssl/client_cert_store_nss.cc", - "ssl/client_cert_store_nss.h", - ] deps += [ "//third_party/nss:nspr", "//third_party/nss", ] libs = [ - "$SDKROOT/System/Library/Frameworks/Foundation.framework", - "$SDKROOT/System/Library/Frameworks/Security.framework", - "$SDKROOT/System/Library/Frameworks/SystemConfiguration.framework", - "$SDKROOT/usr/lib/libresolv.dylib", + "Foundation.framework", + "Security.framework", + "SystemConfiguration.framework", + "resolv", ] } @@ -418,11 +414,11 @@ component("net") { "//third_party/nss", ] libs = [ - "$SDKROOT/System/Library/Frameworks/CFNetwork.framework", - "$SDKROOT/System/Library/Frameworks/MobileCoreServices.framework", - "$SDKROOT/System/Library/Frameworks/Security.framework", - "$SDKROOT/System/Library/Frameworks/SystemConfiguration.framework", - "$SDKROOT/usr/lib/libresolv.dylib", + "CFNetwork.framework", + "MobileCoreServices.framework", + "Security.framework", + "SystemConfiguration.framework", + "resolv", ] } diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 904e8b8..04919bf 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -74,11 +74,19 @@ config("skia_config") { } } -config("skia_dependent_config") { -} - # Internal-facing config for Skia library code. config("skia_library_config") { + # These include directories are only included for Skia code and are not + # exported to dependents. It's not clear if this is on purpose, but this + # matches the GYP build. + include_dirs = [] + if (is_mac || is_ios) { + include_dirs += [ "//third_party/skia/include/utils/mac" ] + } + if (is_mac) { + include_dirs += [ "//third_party/skia/include/utils/ios" ] + } + defines = [ #skia_export_defines ???) TODO @@ -250,8 +258,6 @@ component("skia") { "//third_party/skia/src/ports/SkOSFile_posix.cpp", "//third_party/skia/src/ports/SkTime_Unix.cpp", "//third_party/skia/src/ports/SkTLS_pthread.cpp", - "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", - "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp", ] } else { sources -= [ @@ -277,6 +283,8 @@ component("skia") { } if (!is_linux) { sources -= [ + "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp", + "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp", @@ -302,6 +310,13 @@ component("skia") { ] } + if (is_clang) { + # Skia won't compile with some of the more strict clang warnings. + # e.g. it does: + # SkASSERT(!"sk_out_of_memory"); + configs -= [ "//build/config/clang:extra_warnings" ] + } + configs -= [ "//build/config/compiler:chromium_code" ] configs += [ ":skia_library_config", diff --git a/skia/skia_gn_files.gypi b/skia/skia_gn_files.gypi index a555fff..f5840c5 100644 --- a/skia/skia_gn_files.gypi +++ b/skia/skia_gn_files.gypi @@ -801,7 +801,6 @@ '<(skia_src_path)/utils/debugger/SkDrawCommand.h', '<(skia_src_path)/utils/debugger/SkObjectParser.cpp', '<(skia_src_path)/utils/debugger/SkObjectParser.h', - '<(skia_src_path)/utils/mac/SkCreateCGImageRef.cpp', '<(skia_src_path)/utils/SkBase64.cpp', '<(skia_src_path)/utils/SkBase64.h', '<(skia_src_path)/utils/SkBitmapHasher.cpp', diff --git a/third_party/sqlite/BUILD.gn b/third_party/sqlite/BUILD.gn index 9012ba3..b78bd11 100644 --- a/third_party/sqlite/BUILD.gn +++ b/third_party/sqlite/BUILD.gn @@ -1,117 +1,117 @@ -# Copyright (c) 2013 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-config("sqlite_config") {
- include_dirs = [ "." ]
-}
-
-source_set("sqlite") {
- sources = [
- "amalgamation/sqlite3.h",
- "amalgamation/sqlite3.c",
- # fts2.c currently has a lot of conflicts when added to
- # the amalgamation. It is probably not worth fixing that.
- "src/ext/fts2/fts2.c",
- "src/ext/fts2/fts2.h",
- "src/ext/fts2/fts2_hash.c",
- "src/ext/fts2/fts2_hash.h",
- "src/ext/fts2/fts2_icu.c",
- "src/ext/fts2/fts2_porter.c",
- "src/ext/fts2/fts2_tokenizer.c",
- "src/ext/fts2/fts2_tokenizer.h",
- "src/ext/fts2/fts2_tokenizer1.c",
- ]
-
- cflags = []
- defines = [
- "SQLITE_CORE",
- "SQLITE_ENABLE_BROKEN_FTS2",
- "SQLITE_ENABLE_FTS2",
- "SQLITE_ENABLE_FTS3",
- "SQLITE_ENABLE_ICU",
- "SQLITE_ENABLE_MEMORY_MANAGEMENT",
- "SQLITE_SECURE_DELETE",
- "SQLITE_SEPARATE_CACHE_POOLS",
- "THREADSAFE",
- "_HAS_EXCEPTIONS=0",
- ]
- if (is_chromeos) {
- defines += [
- # Despite obvious warnings about not using this flag in deployment, we
- # are turning off sync in ChromeOS and relying on the underlying
- # journaling filesystem to do error recovery properly. It's much faster.
- "SQLITE_NO_SYNC",
- ]
- }
-
- include_dirs = [
- "amalgamation",
- "src/src", # Needed for fts2 to build.
- ]
-
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [ "//build/config/compiler:no_chromium_code" ]
-
- if (is_win) {
- cflags += [ "/wd4267" ] # Conversion from size_t to "type".
- } else if (is_linux) {
- cflags += [
- # SQLite doesn"t believe in compiler warnings,
- # preferring testing.
- # http://www.sqlite.org/faq.html#q17
- "-Wno-int-to-pointer-cast",
- "-Wno-pointer-to-int-cast",
- ]
- libs = [ "dl" ]
- } else if (is_mac || is_ios) {
- libs += [ "CoreFoundation.framework" ]
- } else if (is_android) {
- defines += [
- "HAVE_USLEEP=1",
- "SQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576",
- "SQLITE_DEFAULT_AUTOVACUUM=1",
- "SQLITE_TEMP_STORE=3",
- "SQLITE_ENABLE_FTS3_BACKWARDS",
- "DSQLITE_DEFAULT_FILE_FORMAT=4",
- ]
- }
-
- if (is_clang) {
- cflags += [
- # sqlite does `if (*a++ && *b++);` in a non-buggy way.
- "-Wno-empty-body",
- # sqlite has some `unsigned < 0` checks.
- "-Wno-tautological-compare",
- ]
- }
-
- direct_dependent_configs = [ ":sqlite_config" ]
-
- deps = [
- "//third_party/icu",
- ]
-}
-
-if (is_linux) {
- executable("sqlite_shell") {
- sources = [
- "src/src/shell.c",
- "src/src/shell_icu_linux.c",
- # Include a dummy c++ file to force linking of libstdc++.
- "build_as_cpp.cc",
- ]
-
- deps = [
- ":sqlite",
- "//third_party/icu",
- ]
- }
-}
-
-if (is_ios) {
- source_set("sqlite_regexp") {
- sources = [ "src/ext/icu/icu.c" ]
- deps = [ "//third_party/icu" ]
- }
-}
+# Copyright (c) 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +config("sqlite_config") { + include_dirs = [ "." ] +} + +source_set("sqlite") { + sources = [ + "amalgamation/sqlite3.h", + "amalgamation/sqlite3.c", + # fts2.c currently has a lot of conflicts when added to + # the amalgamation. It is probably not worth fixing that. + "src/ext/fts2/fts2.c", + "src/ext/fts2/fts2.h", + "src/ext/fts2/fts2_hash.c", + "src/ext/fts2/fts2_hash.h", + "src/ext/fts2/fts2_icu.c", + "src/ext/fts2/fts2_porter.c", + "src/ext/fts2/fts2_tokenizer.c", + "src/ext/fts2/fts2_tokenizer.h", + "src/ext/fts2/fts2_tokenizer1.c", + ] + + cflags = [] + defines = [ + "SQLITE_CORE", + "SQLITE_ENABLE_BROKEN_FTS2", + "SQLITE_ENABLE_FTS2", + "SQLITE_ENABLE_FTS3", + "SQLITE_ENABLE_ICU", + "SQLITE_ENABLE_MEMORY_MANAGEMENT", + "SQLITE_SECURE_DELETE", + "SQLITE_SEPARATE_CACHE_POOLS", + "THREADSAFE", + "_HAS_EXCEPTIONS=0", + ] + if (is_chromeos) { + defines += [ + # Despite obvious warnings about not using this flag in deployment, we + # are turning off sync in ChromeOS and relying on the underlying + # journaling filesystem to do error recovery properly. It's much faster. + "SQLITE_NO_SYNC", + ] + } + + include_dirs = [ + "amalgamation", + "src/src", # Needed for fts2 to build. + ] + + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + + if (is_win) { + cflags += [ "/wd4267" ] # Conversion from size_t to "type". + } else if (is_linux) { + cflags += [ + # SQLite doesn"t believe in compiler warnings, + # preferring testing. + # http://www.sqlite.org/faq.html#q17 + "-Wno-int-to-pointer-cast", + "-Wno-pointer-to-int-cast", + ] + libs = [ "dl" ] + } else if (is_mac || is_ios) { + libs = [ "CoreFoundation.framework" ] + } else if (is_android) { + defines += [ + "HAVE_USLEEP=1", + "SQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576", + "SQLITE_DEFAULT_AUTOVACUUM=1", + "SQLITE_TEMP_STORE=3", + "SQLITE_ENABLE_FTS3_BACKWARDS", + "DSQLITE_DEFAULT_FILE_FORMAT=4", + ] + } + + if (is_clang) { + cflags += [ + # sqlite does `if (*a++ && *b++);` in a non-buggy way. + "-Wno-empty-body", + # sqlite has some `unsigned < 0` checks. + "-Wno-tautological-compare", + ] + } + + direct_dependent_configs = [ ":sqlite_config" ] + + deps = [ + "//third_party/icu", + ] +} + +if (is_linux) { + executable("sqlite_shell") { + sources = [ + "src/src/shell.c", + "src/src/shell_icu_linux.c", + # Include a dummy c++ file to force linking of libstdc++. + "build_as_cpp.cc", + ] + + deps = [ + ":sqlite", + "//third_party/icu", + ] + } +} + +if (is_ios) { + source_set("sqlite_regexp") { + sources = [ "src/ext/icu/icu.c" ] + deps = [ "//third_party/icu" ] + } +} diff --git a/tools/gn/secondary/chrome/BUILD.gn b/tools/gn/secondary/chrome/BUILD.gn index 4ffae6d..cf95e19 100644 --- a/tools/gn/secondary/chrome/BUILD.gn +++ b/tools/gn/secondary/chrome/BUILD.gn @@ -81,7 +81,7 @@ static_library("browser") { } static_library("common") { - if (use_nss && is_linux) { + if (!use_openssl && is_linux) { # common/net uses NSS. # TODO(brettw) have a better way to express this without having to do # "if (use_nss)" everywhere. diff --git a/tools/gn/secondary/net/BUILD.gn b/tools/gn/secondary/net/BUILD.gn deleted file mode 100644 index 8aaf55d..0000000 --- a/tools/gn/secondary/net/BUILD.gn +++ /dev/null @@ -1,1221 +0,0 @@ -# Copyright (c) 2013 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/crypto.gni") -import("//tools/grit/grit_rule.gni") - -component("net") { - sources = [ - "android/cert_verify_result_android.h", - "android/cert_verify_result_android_list.h", - "android/gurl_utils.cc", - "android/gurl_utils.h", - "android/keystore.cc", - "android/keystore.h", - "android/keystore_openssl.cc", - "android/keystore_openssl.h", - "android/net_jni_registrar.cc", - "android/net_jni_registrar.h", - "android/network_change_notifier_android.cc", - "android/network_change_notifier_android.h", - "android/network_change_notifier_delegate_android.cc", - "android/network_change_notifier_delegate_android.h", - "android/network_change_notifier_factory_android.cc", - "android/network_change_notifier_factory_android.h", - "android/network_library.cc", - "android/network_library.h", - "base/address_family.h", - "base/address_list.cc", - "base/address_list.h", - "base/address_tracker_linux.cc", - "base/address_tracker_linux.h", - "base/auth.cc", - "base/auth.h", - "base/backoff_entry.cc", - "base/backoff_entry.h", - "base/bandwidth_metrics.cc", - "base/bandwidth_metrics.h", - "base/big_endian.cc", - "base/big_endian.h", - "base/cache_type.h", - "base/completion_callback.h", - "base/connection_type_histograms.cc", - "base/connection_type_histograms.h", - "base/crypto_module.h", - "base/crypto_module_nss.cc", - "base/crypto_module_openssl.cc", - "base/data_url.cc", - "base/data_url.h", - "base/directory_lister.cc", - "base/directory_lister.h", - "base/dns_reloader.cc", - "base/dns_reloader.h", - "base/dns_util.cc", - "base/dns_util.h", - "base/escape.cc", - "base/escape.h", - "base/expiring_cache.h", - "base/file_stream.cc", - "base/file_stream.h", - "base/file_stream_context.cc", - "base/file_stream_context.h", - "base/file_stream_context_posix.cc", - "base/file_stream_context_win.cc", - "base/file_stream_metrics.cc", - "base/file_stream_metrics.h", - "base/file_stream_metrics_posix.cc", - "base/file_stream_metrics_win.cc", - "base/file_stream_net_log_parameters.cc", - "base/file_stream_net_log_parameters.h", - "base/file_stream_whence.h", - "base/filter.cc", - "base/filter.h", - "base/int128.cc", - "base/int128.h", - "base/gzip_filter.cc", - "base/gzip_filter.h", - "base/gzip_header.cc", - "base/gzip_header.h", - "base/hash_value.cc", - "base/hash_value.h", - "base/host_mapping_rules.cc", - "base/host_mapping_rules.h", - "base/host_port_pair.cc", - "base/host_port_pair.h", - "base/io_buffer.cc", - "base/io_buffer.h", - "base/iovec.h", - "base/ip_endpoint.cc", - "base/ip_endpoint.h", - "base/keygen_handler.cc", - "base/keygen_handler.h", - "base/keygen_handler_mac.cc", - "base/keygen_handler_nss.cc", - "base/keygen_handler_openssl.cc", - "base/keygen_handler_win.cc", - "base/linked_hash_map.h", - "base/load_flags.h", - "base/load_flags_list.h", - "base/load_states.h", - "base/load_states_list.h", - "base/load_timing_info.cc", - "base/load_timing_info.h", - "base/mime_sniffer.cc", - "base/mime_sniffer.h", - "base/mime_util.cc", - "base/mime_util.h", - "base/net_error_list.h", - "base/net_errors.cc", - "base/net_errors.h", - "base/net_errors_posix.cc", - "base/net_errors_win.cc", - "base/net_export.h", - "base/net_log.cc", - "base/net_log.h", - "base/net_log_logger.cc", - "base/net_log_logger.h", - "base/net_log_event_type_list.h", - "base/net_log_source_type_list.h", - "base/net_module.cc", - "base/net_module.h", - "base/net_util.cc", - "base/net_util.h", - "base/net_util_icu.cc", - "base/net_util_posix.cc", - "base/net_util_win.cc", - "base/network_change_notifier.cc", - "base/network_change_notifier.h", - "base/network_change_notifier_factory.h", - "base/network_change_notifier_linux.cc", - "base/network_change_notifier_linux.h", - "base/network_change_notifier_mac.cc", - "base/network_change_notifier_mac.h", - "base/network_change_notifier_win.cc", - "base/network_change_notifier_win.h", - "base/network_config_watcher_mac.cc", - "base/network_config_watcher_mac.h", - "base/network_delegate.cc", - "base/network_delegate.h", - "base/network_time_notifier.cc", - "base/network_time_notifier.h", - "base/nss_memio.c", - "base/nss_memio.h", - "base/openssl_private_key_store.h", - "base/openssl_private_key_store_android.cc", - "base/openssl_private_key_store_memory.cc", - "base/platform_mime_util.h", - # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types? - "base/platform_mime_util_linux.cc", - "base/platform_mime_util_mac.mm", - "base/platform_mime_util_win.cc", - "base/prioritized_dispatcher.cc", - "base/prioritized_dispatcher.h", - "base/priority_queue.h", - "base/rand_callback.h", - "base/registry_controlled_domains/registry_controlled_domain.cc", - "base/registry_controlled_domains/registry_controlled_domain.h", - "base/request_priority.h", - "base/sdch_filter.cc", - "base/sdch_filter.h", - "base/sdch_manager.cc", - "base/sdch_manager.h", - "base/static_cookie_policy.cc", - "base/static_cookie_policy.h", - "base/sys_addrinfo.h", - "base/test_data_stream.cc", - "base/test_data_stream.h", - "base/upload_bytes_element_reader.cc", - "base/upload_bytes_element_reader.h", - "base/upload_data.cc", - "base/upload_data.h", - "base/upload_data_stream.cc", - "base/upload_data_stream.h", - "base/upload_element.cc", - "base/upload_element.h", - "base/upload_element_reader.cc", - "base/upload_element_reader.h", - "base/upload_file_element_reader.cc", - "base/upload_file_element_reader.h", - "base/upload_progress.h", - "base/url_util.cc", - "base/url_util.h", - "base/winsock_init.cc", - "base/winsock_init.h", - "base/winsock_util.cc", - "base/winsock_util.h", - "base/zap.cc", - "base/zap.h", - "cert/asn1_util.cc", - "cert/asn1_util.h", - "cert/cert_database.cc", - "cert/cert_database.h", - "cert/cert_database_android.cc", - "cert/cert_database_ios.cc", - "cert/cert_database_mac.cc", - "cert/cert_database_nss.cc", - "cert/cert_database_openssl.cc", - "cert/cert_database_win.cc", - "cert/cert_status_flags.cc", - "cert/cert_status_flags.h", - "cert/cert_trust_anchor_provider.h", - "cert/cert_verifier.cc", - "cert/cert_verifier.h", - "cert/cert_verify_proc.cc", - "cert/cert_verify_proc.h", - "cert/cert_verify_proc_android.cc", - "cert/cert_verify_proc_android.h", - "cert/cert_verify_proc_mac.cc", - "cert/cert_verify_proc_mac.h", - "cert/cert_verify_proc_nss.cc", - "cert/cert_verify_proc_nss.h", - "cert/cert_verify_proc_openssl.cc", - "cert/cert_verify_proc_openssl.h", - "cert/cert_verify_proc_win.cc", - "cert/cert_verify_proc_win.h", - "cert/cert_verify_result.cc", - "cert/cert_verify_result.h", - "cert/crl_set.cc", - "cert/crl_set.h", - "cert/ev_root_ca_metadata.cc", - "cert/ev_root_ca_metadata.h", - "cert/jwk_serializer_nss.cc", - "cert/jwk_serializer_openssl.cc", - "cert/jwk_serializer.h", - "cert/multi_threaded_cert_verifier.cc", - "cert/multi_threaded_cert_verifier.h", - "cert/nss_cert_database.cc", - "cert/nss_cert_database.h", - "cert/pem_tokenizer.cc", - "cert/pem_tokenizer.h", - "cert/single_request_cert_verifier.cc", - "cert/single_request_cert_verifier.h", - "cert/test_root_certs.cc", - "cert/test_root_certs.h", - "cert/test_root_certs_mac.cc", - "cert/test_root_certs_nss.cc", - "cert/test_root_certs_openssl.cc", - "cert/test_root_certs_android.cc", - "cert/test_root_certs_win.cc", - "cert/x509_cert_types.cc", - "cert/x509_cert_types.h", - "cert/x509_cert_types_mac.cc", - "cert/x509_cert_types_win.cc", - "cert/x509_certificate.cc", - "cert/x509_certificate.h", - "cert/x509_certificate_ios.cc", - "cert/x509_certificate_mac.cc", - "cert/x509_certificate_net_log_param.cc", - "cert/x509_certificate_net_log_param.h", - "cert/x509_certificate_nss.cc", - "cert/x509_certificate_openssl.cc", - "cert/x509_certificate_win.cc", - "cert/x509_util.h", - "cert/x509_util.cc", - "cert/x509_util_android.cc", - "cert/x509_util_android.h", - "cert/x509_util_ios.cc", - "cert/x509_util_ios.h", - "cert/x509_util_mac.cc", - "cert/x509_util_mac.h", - "cert/x509_util_nss.cc", - "cert/x509_util_nss.h", - "cert/x509_util_openssl.cc", - "cert/x509_util_openssl.h", - "cookies/canonical_cookie.cc", - "cookies/canonical_cookie.h", - "cookies/cookie_constants.cc", - "cookies/cookie_constants.h", - "cookies/cookie_monster.cc", - "cookies/cookie_monster.h", - "cookies/cookie_options.h", - "cookies/cookie_store.cc", - "cookies/cookie_store.h", - "cookies/cookie_util.cc", - "cookies/cookie_util.h", - "cookies/parsed_cookie.cc", - "cookies/parsed_cookie.h", - "disk_cache/addr.cc", - "disk_cache/addr.h", - "disk_cache/backend_impl.cc", - "disk_cache/backend_impl.h", - "disk_cache/bitmap.cc", - "disk_cache/bitmap.h", - "disk_cache/block_files.cc", - "disk_cache/block_files.h", - "disk_cache/cache_creator.cc", - "disk_cache/cache_util.h", - "disk_cache/cache_util.cc", - "disk_cache/cache_util_posix.cc", - "disk_cache/cache_util_win.cc", - "disk_cache/disk_cache.h", - "disk_cache/disk_format.cc", - "disk_cache/disk_format.h", - "disk_cache/disk_format_base.h", - "disk_cache/entry_impl.cc", - "disk_cache/entry_impl.h", - "disk_cache/errors.h", - "disk_cache/eviction.cc", - "disk_cache/eviction.h", - "disk_cache/experiments.h", - "disk_cache/file.cc", - "disk_cache/file.h", - "disk_cache/file_block.h", - "disk_cache/file_lock.cc", - "disk_cache/file_lock.h", - "disk_cache/file_posix.cc", - "disk_cache/file_win.cc", - "disk_cache/histogram_macros.h", - "disk_cache/in_flight_backend_io.cc", - "disk_cache/in_flight_backend_io.h", - "disk_cache/in_flight_io.cc", - "disk_cache/in_flight_io.h", - "disk_cache/mapped_file.h", - "disk_cache/mapped_file_posix.cc", - "disk_cache/mapped_file_avoid_mmap_posix.cc", - "disk_cache/mapped_file_win.cc", - "disk_cache/mem_backend_impl.cc", - "disk_cache/mem_backend_impl.h", - "disk_cache/mem_entry_impl.cc", - "disk_cache/mem_entry_impl.h", - "disk_cache/mem_rankings.cc", - "disk_cache/mem_rankings.h", - "disk_cache/net_log_parameters.cc", - "disk_cache/net_log_parameters.h", - "disk_cache/rankings.cc", - "disk_cache/rankings.h", - "disk_cache/sparse_control.cc", - "disk_cache/sparse_control.h", - "disk_cache/stats.cc", - "disk_cache/stats.h", - "disk_cache/stats_histogram.cc", - "disk_cache/stats_histogram.h", - "disk_cache/storage_block-inl.h", - "disk_cache/storage_block.h", - "disk_cache/stress_support.h", - "disk_cache/trace.cc", - "disk_cache/trace.h", - "disk_cache/tracing_cache_backend.cc", - "disk_cache/tracing_cache_backend.h", - "disk_cache/simple/simple_backend_impl.cc", - "disk_cache/simple/simple_backend_impl.h", - "disk_cache/simple/simple_entry_format.cc", - "disk_cache/simple/simple_entry_format.h", - "disk_cache/simple/simple_entry_impl.cc", - "disk_cache/simple/simple_entry_impl.h", - "disk_cache/simple/simple_entry_operation.cc", - "disk_cache/simple/simple_entry_operation.h", - "disk_cache/simple/simple_index.cc", - "disk_cache/simple/simple_index.h", - "disk_cache/simple/simple_index_file.cc", - "disk_cache/simple/simple_index_file.h", - "disk_cache/simple/simple_index_file_posix.cc", - "disk_cache/simple/simple_index_file_win.cc", - "disk_cache/simple/simple_net_log_parameters.cc", - "disk_cache/simple/simple_net_log_parameters.h", - "disk_cache/simple/simple_synchronous_entry.cc", - "disk_cache/simple/simple_synchronous_entry.h", - "disk_cache/simple/simple_util.cc", - "disk_cache/simple/simple_util.h", - "disk_cache/flash/flash_entry_impl.cc", - "disk_cache/flash/flash_entry_impl.h", - "disk_cache/flash/format.h", - "disk_cache/flash/internal_entry.cc", - "disk_cache/flash/internal_entry.h", - "disk_cache/flash/log_store.cc", - "disk_cache/flash/log_store.h", - "disk_cache/flash/log_store_entry.cc", - "disk_cache/flash/log_store_entry.h", - "disk_cache/flash/segment.cc", - "disk_cache/flash/segment.h", - "disk_cache/flash/storage.cc", - "disk_cache/flash/storage.h", - "disk_cache/v3/disk_format_v3.h", - "dns/address_sorter.h", - "dns/address_sorter_posix.cc", - "dns/address_sorter_posix.h", - "dns/address_sorter_win.cc", - "dns/dns_client.cc", - "dns/dns_client.h", - "dns/dns_config_service.cc", - "dns/dns_config_service.h", - "dns/dns_config_service_posix.cc", - "dns/dns_config_service_posix.h", - "dns/dns_config_service_win.cc", - "dns/dns_config_service_win.h", - "dns/dns_hosts.cc", - "dns/dns_hosts.h", - "dns/dns_protocol.h", - "dns/dns_query.cc", - "dns/dns_query.h", - "dns/dns_response.cc", - "dns/dns_response.h", - "dns/dns_session.cc", - "dns/dns_session.h", - "dns/dns_socket_pool.cc", - "dns/dns_socket_pool.h", - "dns/dns_transaction.cc", - "dns/dns_transaction.h", - "dns/host_cache.cc", - "dns/host_cache.h", - "dns/host_resolver.cc", - "dns/host_resolver.h", - "dns/host_resolver_impl.cc", - "dns/host_resolver_impl.h", - "dns/host_resolver_proc.cc", - "dns/host_resolver_proc.h", - "dns/mapped_host_resolver.cc", - "dns/mapped_host_resolver.h", - "dns/mdns_cache.cc", - "dns/mdns_cache.h", - "dns/mdns_client.cc", - "dns/mdns_client.h", - "dns/mdns_client_impl.cc", - "dns/mdns_client_impl.h", - "dns/notify_watcher_mac.cc", - "dns/notify_watcher_mac.h", - "dns/record_parsed.cc", - "dns/record_parsed.h", - "dns/record_rdata.cc", - "dns/record_rdata.h", - "dns/serial_worker.cc", - "dns/serial_worker.h", - "dns/single_request_host_resolver.cc", - "dns/single_request_host_resolver.h", - "ftp/ftp_auth_cache.cc", - "ftp/ftp_auth_cache.h", - "ftp/ftp_ctrl_response_buffer.cc", - "ftp/ftp_ctrl_response_buffer.h", - "ftp/ftp_directory_listing_parser.cc", - "ftp/ftp_directory_listing_parser.h", - "ftp/ftp_directory_listing_parser_ls.cc", - "ftp/ftp_directory_listing_parser_ls.h", - "ftp/ftp_directory_listing_parser_netware.cc", - "ftp/ftp_directory_listing_parser_netware.h", - "ftp/ftp_directory_listing_parser_os2.cc", - "ftp/ftp_directory_listing_parser_os2.h", - "ftp/ftp_directory_listing_parser_vms.cc", - "ftp/ftp_directory_listing_parser_vms.h", - "ftp/ftp_directory_listing_parser_windows.cc", - "ftp/ftp_directory_listing_parser_windows.h", - "ftp/ftp_network_layer.cc", - "ftp/ftp_network_layer.h", - "ftp/ftp_network_session.cc", - "ftp/ftp_network_session.h", - "ftp/ftp_network_transaction.cc", - "ftp/ftp_network_transaction.h", - "ftp/ftp_request_info.h", - "ftp/ftp_response_info.cc", - "ftp/ftp_response_info.h", - "ftp/ftp_server_type_histograms.cc", - "ftp/ftp_server_type_histograms.h", - "ftp/ftp_transaction.h", - "ftp/ftp_transaction_factory.h", - "ftp/ftp_util.cc", - "ftp/ftp_util.h", - "http/des.cc", - "http/des.h", - "http/http_atom_list.h", - "http/http_auth.cc", - "http/http_auth.h", - "http/http_auth_cache.cc", - "http/http_auth_cache.h", - "http/http_auth_controller.cc", - "http/http_auth_controller.h", - "http/http_auth_filter.cc", - "http/http_auth_filter.h", - "http/http_auth_filter_win.h", - "http/http_auth_gssapi_posix.cc", - "http/http_auth_gssapi_posix.h", - "http/http_auth_handler.cc", - "http/http_auth_handler.h", - "http/http_auth_handler_basic.cc", - "http/http_auth_handler_basic.h", - "http/http_auth_handler_digest.cc", - "http/http_auth_handler_digest.h", - "http/http_auth_handler_factory.cc", - "http/http_auth_handler_factory.h", - "http/http_auth_handler_negotiate.cc", - "http/http_auth_handler_negotiate.h", - "http/http_auth_handler_ntlm.cc", - "http/http_auth_handler_ntlm.h", - "http/http_auth_handler_ntlm_portable.cc", - "http/http_auth_handler_ntlm_win.cc", - "http/http_auth_sspi_win.cc", - "http/http_auth_sspi_win.h", - "http/http_basic_stream.cc", - "http/http_basic_stream.h", - "http/http_byte_range.cc", - "http/http_byte_range.h", - "http/http_cache.cc", - "http/http_cache.h", - "http/http_cache_transaction.cc", - "http/http_cache_transaction.h", - "http/http_content_disposition.cc", - "http/http_content_disposition.h", - "http/http_chunked_decoder.cc", - "http/http_chunked_decoder.h", - "http/http_network_layer.cc", - "http/http_network_layer.h", - "http/http_network_session.cc", - "http/http_network_session.h", - "http/http_network_session_peer.cc", - "http/http_network_session_peer.h", - "http/http_network_transaction.cc", - "http/http_network_transaction.h", - "http/http_pipelined_connection.h", - "http/http_pipelined_connection_impl.cc", - "http/http_pipelined_connection_impl.h", - "http/http_pipelined_host.cc", - "http/http_pipelined_host.h", - "http/http_pipelined_host_capability.h", - "http/http_pipelined_host_forced.cc", - "http/http_pipelined_host_forced.h", - "http/http_pipelined_host_impl.cc", - "http/http_pipelined_host_impl.h", - "http/http_pipelined_host_pool.cc", - "http/http_pipelined_host_pool.h", - "http/http_pipelined_stream.cc", - "http/http_pipelined_stream.h", - "http/http_proxy_client_socket.cc", - "http/http_proxy_client_socket.h", - "http/http_proxy_client_socket_pool.cc", - "http/http_proxy_client_socket_pool.h", - "http/http_request_headers.cc", - "http/http_request_headers.h", - "http/http_request_info.cc", - "http/http_request_info.h", - "http/http_response_body_drainer.cc", - "http/http_response_body_drainer.h", - "http/http_response_headers.cc", - "http/http_response_headers.h", - "http/http_response_info.cc", - "http/http_response_info.h", - "http/http_security_headers.cc", - "http/http_security_headers.h", - "http/http_server_properties.cc", - "http/http_server_properties.h", - "http/http_server_properties_impl.cc", - "http/http_server_properties_impl.h", - "http/http_status_code.cc", - "http/http_status_code.h", - "http/http_stream.h", - "http/http_stream_base.h", - "http/http_stream_factory.cc", - "http/http_stream_factory.h", - "http/http_stream_factory_impl.cc", - "http/http_stream_factory_impl.h", - "http/http_stream_factory_impl_job.cc", - "http/http_stream_factory_impl_job.h", - "http/http_stream_factory_impl_request.cc", - "http/http_stream_factory_impl_request.h", - "http/http_stream_parser.cc", - "http/http_stream_parser.h", - "http/http_transaction.h", - "http/http_transaction_delegate.h", - "http/http_transaction_factory.h", - "http/http_util.cc", - "http/http_util.h", - "http/http_util_icu.cc", - "http/http_vary_data.cc", - "http/http_vary_data.h", - "http/http_version.h", - "http/md4.cc", - "http/md4.h", - "http/partial_data.cc", - "http/partial_data.h", - "http/proxy_client_socket.h", - "http/proxy_client_socket.cc", - "http/proxy_connect_redirect_http_stream.h", - "http/proxy_connect_redirect_http_stream.cc", - "http/transport_security_state.cc", - "http/transport_security_state.h", - "http/transport_security_state_static.h", - "http/url_security_manager.cc", - "http/url_security_manager.h", - "http/url_security_manager_posix.cc", - "http/url_security_manager_win.cc", - "ocsp/nss_ocsp.cc", - "ocsp/nss_ocsp.h", - "proxy/dhcp_proxy_script_adapter_fetcher_win.cc", - "proxy/dhcp_proxy_script_adapter_fetcher_win.h", - "proxy/dhcp_proxy_script_fetcher.cc", - "proxy/dhcp_proxy_script_fetcher.h", - "proxy/dhcp_proxy_script_fetcher_factory.cc", - "proxy/dhcp_proxy_script_fetcher_factory.h", - "proxy/dhcp_proxy_script_fetcher_win.cc", - "proxy/dhcp_proxy_script_fetcher_win.h", - "proxy/dhcpcsvc_init_win.cc", - "proxy/dhcpcsvc_init_win.h", - "proxy/multi_threaded_proxy_resolver.cc", - "proxy/multi_threaded_proxy_resolver.h", - "proxy/network_delegate_error_observer.cc", - "proxy/network_delegate_error_observer.h", - "proxy/polling_proxy_config_service.cc", - "proxy/polling_proxy_config_service.h", - "proxy/proxy_bypass_rules.cc", - "proxy/proxy_bypass_rules.h", - "proxy/proxy_config.cc", - "proxy/proxy_config.h", - "proxy/proxy_config_service.h", - "proxy/proxy_config_service_android.cc", - "proxy/proxy_config_service_android.h", - "proxy/proxy_config_service_fixed.cc", - "proxy/proxy_config_service_fixed.h", - "proxy/proxy_config_service_ios.cc", - "proxy/proxy_config_service_ios.h", - "proxy/proxy_config_service_linux.cc", - "proxy/proxy_config_service_linux.h", - "proxy/proxy_config_service_mac.cc", - "proxy/proxy_config_service_mac.h", - "proxy/proxy_config_service_win.cc", - "proxy/proxy_config_service_win.h", - "proxy/proxy_config_source.cc", - "proxy/proxy_config_source.h", - "proxy/proxy_info.cc", - "proxy/proxy_info.h", - "proxy/proxy_list.cc", - "proxy/proxy_list.h", - "proxy/proxy_resolver.h", - "proxy/proxy_resolver_error_observer.h", - "proxy/proxy_resolver_mac.cc", - "proxy/proxy_resolver_mac.h", - "proxy/proxy_resolver_script.h", - "proxy/proxy_resolver_script_data.cc", - "proxy/proxy_resolver_script_data.h", - "proxy/proxy_resolver_winhttp.cc", - "proxy/proxy_resolver_winhttp.h", - "proxy/proxy_retry_info.h", - "proxy/proxy_script_decider.cc", - "proxy/proxy_script_decider.h", - "proxy/proxy_script_fetcher.h", - "proxy/proxy_script_fetcher_impl.cc", - "proxy/proxy_script_fetcher_impl.h", - "proxy/proxy_server.cc", - "proxy/proxy_server.h", - "proxy/proxy_server_mac.cc", - "proxy/proxy_service.cc", - "proxy/proxy_service.h", - "quic/congestion_control/available_channel_estimator.cc", - "quic/congestion_control/available_channel_estimator.h", - "quic/congestion_control/channel_estimator.cc", - "quic/congestion_control/channel_estimator.h", - "quic/congestion_control/cube_root.cc", - "quic/congestion_control/cube_root.h", - "quic/congestion_control/cubic.cc", - "quic/congestion_control/cubic.h", - "quic/congestion_control/fix_rate_receiver.cc", - "quic/congestion_control/fix_rate_receiver.h", - "quic/congestion_control/fix_rate_sender.cc", - "quic/congestion_control/fix_rate_sender.h", - "quic/congestion_control/hybrid_slow_start.cc", - "quic/congestion_control/hybrid_slow_start.h", - "quic/congestion_control/inter_arrival_bitrate_ramp_up.cc", - "quic/congestion_control/inter_arrival_bitrate_ramp_up.h", - "quic/congestion_control/inter_arrival_overuse_detector.cc", - "quic/congestion_control/inter_arrival_overuse_detector.h", - "quic/congestion_control/inter_arrival_probe.cc", - "quic/congestion_control/inter_arrival_probe.h", - "quic/congestion_control/inter_arrival_receiver.cc", - "quic/congestion_control/inter_arrival_receiver.h", - "quic/congestion_control/inter_arrival_sender.cc", - "quic/congestion_control/inter_arrival_sender.h", - "quic/congestion_control/inter_arrival_state_machine.cc", - "quic/congestion_control/inter_arrival_state_machine.h", - "quic/congestion_control/leaky_bucket.cc", - "quic/congestion_control/leaky_bucket.h", - "quic/congestion_control/paced_sender.cc", - "quic/congestion_control/paced_sender.h", - "quic/congestion_control/quic_max_sized_map.h", - "quic/congestion_control/receive_algorithm_interface.cc", - "quic/congestion_control/receive_algorithm_interface.h", - "quic/congestion_control/send_algorithm_interface.cc", - "quic/congestion_control/send_algorithm_interface.h", - "quic/congestion_control/tcp_cubic_sender.cc", - "quic/congestion_control/tcp_cubic_sender.h", - "quic/congestion_control/tcp_receiver.cc", - "quic/congestion_control/tcp_receiver.h", - "quic/crypto/aes_128_gcm_12_decrypter.h", - "quic/crypto/aes_128_gcm_12_decrypter_nss.cc", - "quic/crypto/aes_128_gcm_12_decrypter_openssl.cc", - "quic/crypto/aes_128_gcm_12_encrypter.h", - "quic/crypto/aes_128_gcm_12_encrypter_nss.cc", - "quic/crypto/aes_128_gcm_12_encrypter_openssl.cc", - "quic/crypto/cert_compressor.cc", - "quic/crypto/cert_compressor.h", - "quic/crypto/channel_id.cc", - "quic/crypto/channel_id.h", - "quic/crypto/channel_id_nss.cc", - "quic/crypto/channel_id_openssl.cc", - "quic/crypto/common_cert_set.cc", - "quic/crypto/common_cert_set.h", - "quic/crypto/crypto_framer.cc", - "quic/crypto/crypto_framer.h", - "quic/crypto/crypto_handshake.cc", - "quic/crypto/crypto_handshake.h", - "quic/crypto/crypto_protocol.h", - "quic/crypto/crypto_secret_boxer.cc", - "quic/crypto/crypto_secret_boxer.h", - "quic/crypto/crypto_server_config_protobuf.cc", - "quic/crypto/crypto_server_config_protobuf.h", - "quic/crypto/crypto_utils.cc", - "quic/crypto/crypto_utils.h", - "quic/crypto/curve25519_key_exchange.cc", - "quic/crypto/curve25519_key_exchange.h", - "quic/crypto/ephemeral_key_source.h", - "quic/crypto/key_exchange.h", - "quic/crypto/null_decrypter.cc", - "quic/crypto/null_decrypter.h", - "quic/crypto/null_encrypter.cc", - "quic/crypto/null_encrypter.h", - "quic/crypto/p256_key_exchange.h", - "quic/crypto/p256_key_exchange_nss.cc", - "quic/crypto/p256_key_exchange_openssl.cc", - "quic/crypto/proof_source.h", - "quic/crypto/proof_source_chromium.cc", - "quic/crypto/proof_source_chromium.h", - "quic/crypto/proof_verifier.cc", - "quic/crypto/proof_verifier_chromium.cc", - "quic/crypto/proof_verifier_chromium.h", - "quic/crypto/quic_decrypter.cc", - "quic/crypto/quic_decrypter.h", - "quic/crypto/quic_encrypter.cc", - "quic/crypto/quic_encrypter.h", - "quic/crypto/quic_random.cc", - "quic/crypto/quic_random.h", - "quic/crypto/scoped_evp_cipher_ctx.cc", - "quic/crypto/scoped_evp_cipher_ctx.h", - "quic/crypto/strike_register.cc", - "quic/crypto/strike_register.h", - "quic/crypto/source_address_token.cc", - "quic/crypto/source_address_token.h", - "quic/quic_alarm.cc", - "quic/quic_alarm.h", - "quic/quic_bandwidth.cc", - "quic/quic_bandwidth.h", - "quic/quic_blocked_writer_interface.h", - "quic/quic_client_session.cc", - "quic/quic_client_session.h", - "quic/quic_config.cc", - "quic/quic_config.h", - "quic/quic_crypto_client_stream.cc", - "quic/quic_crypto_client_stream.h", - "quic/quic_crypto_client_stream_factory.h", - "quic/quic_crypto_server_stream.cc", - "quic/quic_crypto_server_stream.h", - "quic/quic_crypto_stream.cc", - "quic/quic_crypto_stream.h", - "quic/quic_clock.cc", - "quic/quic_clock.h", - "quic/quic_connection.cc", - "quic/quic_connection.h", - "quic/quic_connection_helper.cc", - "quic/quic_connection_helper.h", - "quic/quic_connection_logger.cc", - "quic/quic_connection_logger.h", - "quic/quic_connection_stats.cc", - "quic/quic_connection_stats.h", - "quic/quic_data_reader.cc", - "quic/quic_data_reader.h", - "quic/quic_data_writer.cc", - "quic/quic_data_writer.h", - "quic/quic_fec_group.cc", - "quic/quic_fec_group.h", - "quic/quic_framer.cc", - "quic/quic_framer.h", - "quic/quic_http_stream.cc", - "quic/quic_http_stream.h", - "quic/quic_packet_creator.cc", - "quic/quic_packet_creator.h", - "quic/quic_packet_generator.cc", - "quic/quic_packet_generator.h", - "quic/quic_protocol.cc", - "quic/quic_protocol.h", - "quic/quic_received_packet_manager.cc", - "quic/quic_received_packet_manager.h", - "quic/quic_reliable_client_stream.cc", - "quic/quic_reliable_client_stream.h", - "quic/quic_sent_entropy_manager.cc", - "quic/quic_sent_entropy_manager.h", - "quic/quic_session.cc", - "quic/quic_session.h", - "quic/quic_spdy_compressor.cc", - "quic/quic_spdy_compressor.h", - "quic/quic_spdy_decompressor.cc", - "quic/quic_spdy_decompressor.h", - "quic/quic_stream_factory.cc", - "quic/quic_stream_factory.h", - "quic/quic_stream_sequencer.cc", - "quic/quic_stream_sequencer.h", - "quic/quic_time.cc", - "quic/quic_time.h", - "quic/quic_utils.cc", - "quic/quic_utils.h", - "quic/reliable_quic_stream.cc", - "quic/reliable_quic_stream.h", - "quic/spdy_utils.cc", - "quic/spdy_utils.h", - "socket/buffered_write_stream_socket.cc", - "socket/buffered_write_stream_socket.h", - "socket/client_socket_factory.cc", - "socket/client_socket_factory.h", - "socket/client_socket_handle.cc", - "socket/client_socket_handle.h", - "socket/client_socket_pool.cc", - "socket/client_socket_pool.h", - "socket/client_socket_pool_base.cc", - "socket/client_socket_pool_base.h", - "socket/client_socket_pool_histograms.cc", - "socket/client_socket_pool_histograms.h", - "socket/client_socket_pool_manager.cc", - "socket/client_socket_pool_manager.h", - "socket/client_socket_pool_manager_impl.cc", - "socket/client_socket_pool_manager_impl.h", - "socket/next_proto.h", - "socket/nss_ssl_util.cc", - "socket/nss_ssl_util.h", - "socket/server_socket.h", - "socket/socket_net_log_params.cc", - "socket/socket_net_log_params.h", - "socket/socket.h", - "socket/socks5_client_socket.cc", - "socket/socks5_client_socket.h", - "socket/socks_client_socket.cc", - "socket/socks_client_socket.h", - "socket/socks_client_socket_pool.cc", - "socket/socks_client_socket_pool.h", - "socket/ssl_client_socket.cc", - "socket/ssl_client_socket.h", - "socket/ssl_client_socket_nss.cc", - "socket/ssl_client_socket_nss.h", - "socket/ssl_client_socket_openssl.cc", - "socket/ssl_client_socket_openssl.h", - "socket/ssl_client_socket_pool.cc", - "socket/ssl_client_socket_pool.h", - "socket/ssl_error_params.cc", - "socket/ssl_error_params.h", - "socket/ssl_server_socket.h", - "socket/ssl_server_socket_nss.cc", - "socket/ssl_server_socket_nss.h", - "socket/ssl_server_socket_openssl.cc", - "socket/ssl_socket.h", - "socket/stream_listen_socket.cc", - "socket/stream_listen_socket.h", - "socket/stream_socket.cc", - "socket/stream_socket.h", - "socket/tcp_client_socket.cc", - "socket/tcp_client_socket.h", - "socket/tcp_listen_socket.cc", - "socket/tcp_listen_socket.h", - "socket/tcp_server_socket.cc", - "socket/tcp_server_socket.h", - "socket/tcp_socket_libevent.cc", - "socket/tcp_socket_libevent.h", - "socket/tcp_socket_win.cc", - "socket/tcp_socket_win.h", - "socket/transport_client_socket_pool.cc", - "socket/transport_client_socket_pool.h", - "socket/unix_domain_socket_posix.cc", - "socket/unix_domain_socket_posix.h", - "socket_stream/socket_stream.cc", - "socket_stream/socket_stream.h", - "socket_stream/socket_stream_job.cc", - "socket_stream/socket_stream_job.h", - "socket_stream/socket_stream_job_manager.cc", - "socket_stream/socket_stream_job_manager.h", - "socket_stream/socket_stream_metrics.cc", - "socket_stream/socket_stream_metrics.h", - "spdy/buffered_spdy_framer.cc", - "spdy/buffered_spdy_framer.h", - "spdy/spdy_bitmasks.h", - "spdy/spdy_buffer.cc", - "spdy/spdy_buffer.h", - "spdy/spdy_buffer_producer.cc", - "spdy/spdy_buffer_producer.h", - "spdy/spdy_frame_builder.cc", - "spdy/spdy_frame_builder.h", - "spdy/spdy_frame_reader.cc", - "spdy/spdy_frame_reader.h", - "spdy/spdy_framer.cc", - "spdy/spdy_framer.h", - "spdy/spdy_header_block.cc", - "spdy/spdy_header_block.h", - "spdy/spdy_http_stream.cc", - "spdy/spdy_http_stream.h", - "spdy/spdy_http_utils.cc", - "spdy/spdy_http_utils.h", - "spdy/spdy_priority_forest.h", - "spdy/spdy_protocol.cc", - "spdy/spdy_protocol.h", - "spdy/spdy_proxy_client_socket.cc", - "spdy/spdy_proxy_client_socket.h", - "spdy/spdy_read_queue.cc", - "spdy/spdy_read_queue.h", - "spdy/spdy_session.cc", - "spdy/spdy_session.h", - "spdy/spdy_session_key.cc", - "spdy/spdy_session_key.h", - "spdy/spdy_session_pool.cc", - "spdy/spdy_session_pool.h", - "spdy/spdy_stream.cc", - "spdy/spdy_stream.h", - "spdy/spdy_websocket_stream.cc", - "spdy/spdy_websocket_stream.h", - "spdy/spdy_write_queue.cc", - "spdy/spdy_write_queue.h", - "spdy/write_blocked_list.h", - "ssl/client_cert_store.h", - "ssl/client_cert_store_chromeos.cc", - "ssl/client_cert_store_chromeos.h", - "ssl/client_cert_store_mac.cc", - "ssl/client_cert_store_mac.h", - "ssl/client_cert_store_nss.cc", - "ssl/client_cert_store_nss.h", - "ssl/client_cert_store_win.cc", - "ssl/client_cert_store_win.h", - "ssl/default_server_bound_cert_store.cc", - "ssl/default_server_bound_cert_store.h", - "ssl/openssl_client_key_store.cc", - "ssl/openssl_client_key_store.h", - "ssl/server_bound_cert_service.cc", - "ssl/server_bound_cert_service.h", - "ssl/server_bound_cert_store.cc", - "ssl/server_bound_cert_store.h", - "ssl/ssl_cert_request_info.cc", - "ssl/ssl_cert_request_info.h", - "ssl/ssl_cipher_suite_names.cc", - "ssl/ssl_cipher_suite_names.h", - "ssl/ssl_client_auth_cache.cc", - "ssl/ssl_client_auth_cache.h", - "ssl/ssl_client_cert_type.h", - "ssl/ssl_config_service.cc", - "ssl/ssl_config_service.h", - "ssl/ssl_config_service_defaults.cc", - "ssl/ssl_config_service_defaults.h", - "ssl/ssl_info.cc", - "ssl/ssl_info.h", - "third_party/mozilla_security_manager/nsKeygenHandler.cpp", - "third_party/mozilla_security_manager/nsKeygenHandler.h", - "third_party/mozilla_security_manager/nsNSSCertificateDB.cpp", - "third_party/mozilla_security_manager/nsNSSCertificateDB.h", - "third_party/mozilla_security_manager/nsPKCS12Blob.cpp", - "third_party/mozilla_security_manager/nsPKCS12Blob.h", - "udp/datagram_client_socket.h", - "udp/datagram_server_socket.h", - "udp/datagram_socket.h", - "udp/udp_client_socket.cc", - "udp/udp_client_socket.h", - "udp/udp_net_log_parameters.cc", - "udp/udp_net_log_parameters.h", - "udp/udp_server_socket.cc", - "udp/udp_server_socket.h", - "udp/udp_socket.h", - "udp/udp_socket_libevent.cc", - "udp/udp_socket_libevent.h", - "udp/udp_socket_win.cc", - "udp/udp_socket_win.h", - "url_request/data_protocol_handler.cc", - "url_request/data_protocol_handler.h", - "url_request/file_protocol_handler.cc", - "url_request/file_protocol_handler.h", - "url_request/fraudulent_certificate_reporter.h", - "url_request/ftp_protocol_handler.cc", - "url_request/ftp_protocol_handler.h", - "url_request/http_user_agent_settings.h", - "url_request/protocol_intercept_job_factory.cc", - "url_request/protocol_intercept_job_factory.h", - "url_request/static_http_user_agent_settings.cc", - "url_request/static_http_user_agent_settings.h", - "url_request/url_fetcher.cc", - "url_request/url_fetcher.h", - "url_request/url_fetcher_core.cc", - "url_request/url_fetcher_core.h", - "url_request/url_fetcher_delegate.cc", - "url_request/url_fetcher_delegate.h", - "url_request/url_fetcher_factory.h", - "url_request/url_fetcher_impl.cc", - "url_request/url_fetcher_impl.h", - "url_request/url_fetcher_response_writer.cc", - "url_request/url_fetcher_response_writer.h", - "url_request/url_range_request_job.cc", - "url_request/url_range_request_job.h", - "url_request/url_request.cc", - "url_request/url_request.h", - "url_request/url_request_about_job.cc", - "url_request/url_request_about_job.h", - "url_request/url_request_context.cc", - "url_request/url_request_context.h", - "url_request/url_request_context_builder.cc", - "url_request/url_request_context_builder.h", - "url_request/url_request_context_getter.cc", - "url_request/url_request_context_getter.h", - "url_request/url_request_context_storage.cc", - "url_request/url_request_context_storage.h", - "url_request/url_request_data_job.cc", - "url_request/url_request_data_job.h", - "url_request/url_request_error_job.cc", - "url_request/url_request_error_job.h", - "url_request/url_request_file_dir_job.cc", - "url_request/url_request_file_dir_job.h", - "url_request/url_request_file_job.cc", - "url_request/url_request_file_job.h", - "url_request/url_request_filter.cc", - "url_request/url_request_filter.h", - "url_request/url_request_ftp_job.cc", - "url_request/url_request_ftp_job.h", - "url_request/url_request_http_job.cc", - "url_request/url_request_http_job.h", - "url_request/url_request_job.cc", - "url_request/url_request_job.h", - "url_request/url_request_job_factory.cc", - "url_request/url_request_job_factory.h", - "url_request/url_request_job_factory_impl.cc", - "url_request/url_request_job_factory_impl.h", - "url_request/url_request_job_manager.cc", - "url_request/url_request_job_manager.h", - "url_request/url_request_netlog_params.cc", - "url_request/url_request_netlog_params.h", - "url_request/url_request_redirect_job.cc", - "url_request/url_request_redirect_job.h", - "url_request/url_request_simple_job.cc", - "url_request/url_request_simple_job.h", - "url_request/url_request_status.h", - "url_request/url_request_test_job.cc", - "url_request/url_request_test_job.h", - "url_request/url_request_throttler_entry.cc", - "url_request/url_request_throttler_entry.h", - "url_request/url_request_throttler_entry_interface.h", - "url_request/url_request_throttler_header_adapter.cc", - "url_request/url_request_throttler_header_adapter.h", - "url_request/url_request_throttler_header_interface.h", - "url_request/url_request_throttler_manager.cc", - "url_request/url_request_throttler_manager.h", - "url_request/view_cache_helper.cc", - "url_request/view_cache_helper.h", - "websockets/websocket_channel.cc", - "websockets/websocket_channel.h", - "websockets/websocket_errors.cc", - "websockets/websocket_errors.h", - "websockets/websocket_frame.cc", - "websockets/websocket_frame.h", - "websockets/websocket_frame_parser.cc", - "websockets/websocket_frame_parser.h", - "websockets/websocket_handshake_handler.cc", - "websockets/websocket_handshake_handler.h", - "websockets/websocket_job.cc", - "websockets/websocket_job.h", - "websockets/websocket_mux.h", - "websockets/websocket_net_log_params.cc", - "websockets/websocket_net_log_params.h", - "websockets/websocket_stream.cc", - "websockets/websocket_stream.h", - "websockets/websocket_stream_base.h", - "websockets/websocket_throttle.cc", - "websockets/websocket_throttle.h", - ] - - defines = [ "NET_IMPLEMENTATION" ] - - deps = [ - #":net_resources", - "//base", - "//base:i18n", - "//base/third_party/dynamic_annotations", - "//crypto", - "//crypto:ssl", - "//sdch", - "//third_party/icu", - "//third_party/zlib", - "//url", - ] - - if (is_win) { - sources -= [ - "http/http_auth_handler_ntlm_portable.cc", - "socket/tcp_socket_libevent.cc", - "socket/tcp_socket_libevent.h", - "ssl/client_cert_store_nss.cc", - "ssl/client_cert_store_nss.h", - "udp/udp_socket_libevent.cc", - "udp/udp_socket_libevent.h", - ] - deps += [ - #"//net/third_party/nss:ssl", - #"//third_party/nss:nspr", - #"//third_party/nss:nss", - ] - } else { # !is_win - sources -= [ - "base/winsock_init.cc", - "base/winsock_init.h", - "base/winsock_util.cc", - "base/winsock_util.h", - "proxy/proxy_resolver_winhttp.cc", - "proxy/proxy_resolver_winhttp.h", - ] - } - - if (is_mac) { - sources -= [ - "ssl/client_cert_store_nss.cc", - "ssl/client_cert_store_nss.h", - ] - deps += [ - #"//net/third_party/nss:ssl", - #"//third_party/nss:nspr", - #"//third_party/nss:nss", - ] - } - - if (is_linux && use_nss) { - configs += [ "//third_party/nss:nss_linux_config" ] - } - - if (is_chromeos) { - sources -= [ - "base/network_change_notifier_linux.cc", - "base/network_change_notifier_linux.h", - "proxy/proxy_config_service_linux.cc", - "proxy/proxy_config_service_linux.h", - ] - } - - if (use_openssl) { - sources -= [ - "base/crypto_module_nss.cc", - "base/keygen_handler_nss.cc", - "base/nss_memio.c", - "base/nss_memio.h", - "cert/cert_database_nss.cc", - "cert/cert_verify_proc_nss.cc", - "cert/cert_verify_proc_nss.h", - "cert/jwk_serializer_nss.cc", - "cert/nss_cert_database.cc", - "cert/nss_cert_database.h", - "cert/test_root_certs_nss.cc", - "cert/x509_certificate_nss.cc", - "cert/x509_util_nss.cc", - "cert/x509_util_nss.h", - "ocsp/nss_ocsp.cc", - "ocsp/nss_ocsp.h", - "quic/crypto/aes_128_gcm_12_decrypter_nss.cc", - "quic/crypto/aes_128_gcm_12_encrypter_nss.cc", - "quic/crypto/channel_id_nss.cc", - "quic/crypto/p256_key_exchange_nss.cc", - "socket/nss_ssl_util.cc", - "socket/nss_ssl_util.h", - "socket/ssl_client_socket_nss.cc", - "socket/ssl_client_socket_nss.h", - "socket/ssl_server_socket_nss.cc", - "socket/ssl_server_socket_nss.h", - "ssl/client_cert_store_nss.cc", - "third_party/mozilla_security_manager/nsKeygenHandler.cpp", - "third_party/mozilla_security_manager/nsKeygenHandler.h", - "third_party/mozilla_security_manager/nsNSSCertificateDB.cpp", - "third_party/mozilla_security_manager/nsNSSCertificateDB.h", - "third_party/mozilla_security_manager/nsPKCS12Blob.cpp", - "third_party/mozilla_security_manager/nsPKCS12Blob.h", - ] - } else { # !use_openssl - sources -= [ - "base/crypto_module_openssl.cc", - "base/keygen_handler_openssl.cc", - "base/openssl_private_key_store.h", - #"base/openssl_private_key_store_android.cc", - "base/openssl_private_key_store_memory.cc", - "cert/cert_database_openssl.cc", - "cert/cert_verify_proc_openssl.cc", - "cert/cert_verify_proc_openssl.h", - "cert/jwk_serializer_openssl.cc", - "cert/test_root_certs_openssl.cc", - "cert/x509_certificate_openssl.cc", - "cert/x509_util_openssl.cc", - "cert/x509_util_openssl.h", - "quic/crypto/aes_128_gcm_12_decrypter_openssl.cc", - "quic/crypto/aes_128_gcm_12_encrypter_openssl.cc", - "quic/crypto/channel_id_openssl.cc", - "quic/crypto/p256_key_exchange_openssl.cc", - "quic/crypto/scoped_evp_cipher_ctx.cc", - "quic/crypto/scoped_evp_cipher_ctx.h", - "socket/ssl_client_socket_openssl.cc", - "socket/ssl_client_socket_openssl.h", - "socket/ssl_server_socket_openssl.cc", - "ssl/openssl_client_key_store.cc", - "ssl/openssl_client_key_store.h", - ] - } - - if (is_posix) { - 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" ] - } else { # !posix_avoid_mmap - sources -= [ "disk_cache/mapped_file_avoid_mmap_posix.cc" ] - } - } -} - -#grit("net_resources") { -# source = "base/net_resources.grd" -#} - -static_library("http_server") { - sources = [ - "server/http_connection.cc", - "server/http_connection.h", - "server/http_server.cc", - "server/http_server.h", - "server/http_server_request_info.cc", - "server/http_server_request_info.h", - "server/http_server_response_info.cc", - "server/http_server_response_info.h", - "server/web_socket.cc", - "server/web_socket.h", - ] - configs += [ "//build/config/compiler:wexit_time_destructors" ] - deps = [ - ":net", - "//base", - ] -} diff --git a/tools/gn/secondary/third_party/icu/BUILD.gn b/tools/gn/secondary/third_party/icu/BUILD.gn index fc9da5e..21c4efa 100644 --- a/tools/gn/secondary/third_party/icu/BUILD.gn +++ b/tools/gn/secondary/third_party/icu/BUILD.gn @@ -223,6 +223,19 @@ component("icui18n") { configs += [ ":icu_code" ] direct_dependent_configs = [ ":icu_config" ] + + if (is_clang) { + # uspoof.h has a U_NAMESPACE_USE macro. That's a bug, + # the header should use U_NAMESPACE_BEGIN instead. + # http://bugs.icu-project.org/trac/ticket/9054 + configs -= [ "//build/config/clang:extra_warnings" ] + + cflags = [ + "-Wno-header-hygiene", + # Looks like a real issue, see http://crbug.com/114660 + "-Wno-return-type-c-linkage", + ] + } } component("icuuc") { diff --git a/tools/gn/secondary/third_party/libxml/BUILD.gn b/tools/gn/secondary/third_party/libxml/BUILD.gn index 16fe1b3..e3f26a1 100644 --- a/tools/gn/secondary/third_party/libxml/BUILD.gn +++ b/tools/gn/secondary/third_party/libxml/BUILD.gn @@ -175,6 +175,13 @@ static_library("libxml") { # See http://crbug.com/138571#c8 "-Wno-ignored-attributes", ] + if (is_mac) { + # Mac Clang warnings. + cflags += [ + # debugXML.c compares array 'arg' to NULL. + "-Wno-tautological-pointer-compare", + ] + } } include_dirs = [ diff --git a/tools/gn/secondary/third_party/nss/BUILD.gn b/tools/gn/secondary/third_party/nss/BUILD.gn index 278286d..926b180 100644 --- a/tools/gn/secondary/third_party/nss/BUILD.gn +++ b/tools/gn/secondary/third_party/nss/BUILD.gn @@ -213,11 +213,16 @@ if (is_linux) { configs -= [ "//build/config/compiler:chromium_code", - "//build/config/win:unicode", # Requires 8-bit mode. - "//build/config/win:lean_and_mean", # Won"t compile with lean and mean. ] + if (is_win) { + configs -= [ + "//build/config/win:unicode", # Requires 8-bit mode. + "//build/config/win:lean_and_mean", # Won"t compile with lean and mean. + ] + } configs += [ "//build/config/compiler:no_chromium_code" ] + cflags = [] defines = [ "_NSPR_BUILD", "FORCE_PR_LOG", @@ -430,8 +435,13 @@ if (is_linux) { configs -= [ "//build/config/compiler:chromium_code" - "//build/config/win:unicode", # Requires 8-bit mode. ] + + if (is_win) { + configs -= [ + "//build/config/win:unicode", # Requires 8-bit mode. + ] + } configs += [ "//build/config/compiler:no_chromium_code" ] include_dirs = [ "nss/lib/ckfw" ] @@ -828,8 +838,12 @@ if (is_linux) { configs -= [ "//build/config/compiler:chromium_code" - "//build/config/win:unicode", # Requires 8-bit mode. ] + if (is_win) { + configs -= [ + "//build/config/win:unicode", # Requires 8-bit mode. + ] + } configs += [ "//build/config/compiler:no_chromium_code" ] direct_dependent_configs = [ ":nss_static_config" ] diff --git a/tools/gn/secondary/third_party/snappy/BUILD.gn b/tools/gn/secondary/third_party/snappy/BUILD.gn index 5a0313f..705cb8a 100644 --- a/tools/gn/secondary/third_party/snappy/BUILD.gn +++ b/tools/gn/secondary/third_party/snappy/BUILD.gn @@ -33,22 +33,14 @@ static_library("snappy") { configs += [ "//build/config/compiler:no_chromium_code" ] direct_dependent_configs = [ ":snappy_config" ] - #['OS=="win"', { - # # Signed/unsigned comparison - # 'msvs_disabled_warnings': [ - # # https://code.google.com/p/snappy/issues/detail?id=71 - # 4018, - # # https://code.google.com/p/snappy/issues/detail?id=75 - # 4267, - # ], - # }], - # ['clang == 1', { - # # snappy-stubs-internal.h unapologetically has: using namespace std - # # https://code.google.com/p/snappy/issues/detail?id=70 - # 'xcode_settings': { - # 'WARNING_CFLAGS!': [ '-Wheader-hygiene' ], - # }, - # 'cflags!': [ '-Wheader-hygiene' ], - # }], - # ], + if (is_clang) { + # snappy-stubs-internal.h unapologetically has: using namespace std + # https://code.google.com/p/snappy/issues/detail?id=70 + configs -= [ "//build/config/clang:extra_warnings" ] + } + + if (is_win) { + # https://code.google.com/p/snappy/issues/detail?id=75 + cflags = [ "/wd4267" ] # Conversion from size_t to 'type'. + } } diff --git a/tools/gn/secondary/third_party/zlib/BUILD.gn b/tools/gn/secondary/third_party/zlib/BUILD.gn index 033d4623..9ac85a5 100644 --- a/tools/gn/secondary/third_party/zlib/BUILD.gn +++ b/tools/gn/secondary/third_party/zlib/BUILD.gn @@ -65,7 +65,8 @@ static_library("minizip") { "contrib/minizip/iowin32.c", "contrib/minizip/iowin32.h", ] - } else if (is_mac || is_ios || is_android) { + } + if (is_mac || is_ios || is_android) { # Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We # use fopen, ftell, and fseek instead on these systems. defines = [ "USE_FILE32API" ] diff --git a/ui/events/gesture_detection/gesture_provider_unittest.cc b/ui/events/gesture_detection/gesture_provider_unittest.cc index 74dd767..24d51df 100644 --- a/ui/events/gesture_detection/gesture_provider_unittest.cc +++ b/ui/events/gesture_detection/gesture_provider_unittest.cc @@ -110,7 +110,7 @@ class GestureProviderTest : public testing::Test, public GestureProviderClient { return gestures_.back(); } - const EventType GetMostRecentGestureEventType() const { + EventType GetMostRecentGestureEventType() const { EXPECT_FALSE(gestures_.empty()); return gestures_.back().type; } diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn index 02d2e77..20997aa 100644 --- a/ui/gfx/BUILD.gn +++ b/ui/gfx/BUILD.gn @@ -347,13 +347,20 @@ component("gfx") { sources -= [ "nine_image_painter.cc", "nine_image_painter.h", + "path_aura.cc", ] } + if (use_x11) { deps += [ ":gfx_x11", ] + } else { + sources -= [ + "path_x11.cc", + ] } + if (use_pango) { sources -= [ "platform_font_ozone.cc", |