gn format // (the rest, except mojo)
Excluded mojo because I think that needs to happen on the other side. At gn --version = 306668 for which roll is in CQ. R=brettw@chromium.org TBR=scherkus@chromium.org BUG=348474 Review URL: https://codereview.chromium.org/774353003 Cr-Commit-Position: refs/heads/master@{#306708}
This commit is contained in:
scottmg
.gnBUILD.gn
ash
base/allocator
breakpad
build
config
go
secondary
toolchain
util
cc/surfaces
chromeos
components
autofill
core
browser
bookmarks
common
android
data_reduction_proxy
core
common
domain_reliability
content
courgette
crypto
dbus
device
google_apis
gpu
ipc
jingle
media
net
pdf
ppapi
printing
remoting
sandbox
sdch
skia
sync
testing
third_party
adobe
flash
cython
google_input_tools
opus
stp
widevine
cdm
yasm
tools
android
generate_library_loader
gn
json_schema_compiler
json_to_struct
relocation_packer
xdisplaycheck
ui
url
4
.gn
4
.gn
@ -14,6 +14,4 @@ secondary_source = "//build/secondary/"
|
||||
# matching these patterns (see "gn help label_pattern" for format) will have
|
||||
# their includes checked for proper dependencies when you run either
|
||||
# "gn check" or "gn gen --check".
|
||||
check_targets = [
|
||||
"//base"
|
||||
]
|
||||
check_targets = [ "//base" ]
|
||||
|
||||
17
BUILD.gn
17
BUILD.gn
@ -137,7 +137,8 @@ group("root") {
|
||||
"//ui/web_dialogs",
|
||||
"//url",
|
||||
"//v8:v8",
|
||||
] + root_extra_deps
|
||||
]
|
||||
deps += root_extra_deps
|
||||
|
||||
if (!is_win) {
|
||||
deps += [ "//breakpad:symupload" ]
|
||||
@ -160,16 +161,12 @@ group("root") {
|
||||
}
|
||||
|
||||
if (is_win) {
|
||||
deps += [
|
||||
"//ui/metro_viewer",
|
||||
]
|
||||
deps += [ "//ui/metro_viewer" ]
|
||||
}
|
||||
|
||||
if (is_win || is_mac || is_chromeos) {
|
||||
# RLZ works on these platforms.
|
||||
deps += [
|
||||
"//rlz:rlz_lib",
|
||||
]
|
||||
deps += [ "//rlz:rlz_lib" ]
|
||||
}
|
||||
|
||||
if (cpu_arch == "x86" || cpu_arch == "x64") {
|
||||
@ -195,9 +192,7 @@ group("root") {
|
||||
]
|
||||
|
||||
if (has_chrome_android_internal) {
|
||||
deps += [
|
||||
"//clank",
|
||||
]
|
||||
deps += [ "//clank" ]
|
||||
}
|
||||
|
||||
# TODO(GYP): Move the targets in the rest of this block that still
|
||||
@ -267,7 +262,7 @@ group("root") {
|
||||
]
|
||||
}
|
||||
|
||||
#
|
||||
#
|
||||
# TODO(GYP): Make everything below this work in the GN build.
|
||||
#
|
||||
|
||||
|
||||
35
ash/BUILD.gn
35
ash/BUILD.gn
@ -5,11 +5,10 @@
|
||||
import("//build/config/features.gni")
|
||||
import("//build/config/ui.gni")
|
||||
|
||||
gypi_values = exec_script(
|
||||
"//build/gypi_to_gn.py",
|
||||
[ rebase_path("ash.gyp") ],
|
||||
"scope",
|
||||
[ "ash.gyp" ])
|
||||
gypi_values = exec_script("//build/gypi_to_gn.py",
|
||||
[ rebase_path("ash.gyp") ],
|
||||
"scope",
|
||||
[ "ash.gyp" ])
|
||||
|
||||
component("ash") {
|
||||
sources = gypi_values.ash_sources
|
||||
@ -58,14 +57,13 @@ component("ash") {
|
||||
"sticky_keys/sticky_keys_controller.cc",
|
||||
"sticky_keys/sticky_keys_controller.h",
|
||||
]
|
||||
|
||||
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
||||
cflags = [ "/wd4267" ]
|
||||
}
|
||||
|
||||
if (use_x11) {
|
||||
configs += [
|
||||
"//build/config/linux:xfixes",
|
||||
]
|
||||
configs += [ "//build/config/linux:xfixes" ]
|
||||
} else {
|
||||
sources -= [
|
||||
"accelerators/key_hold_detector.cc",
|
||||
@ -111,9 +109,7 @@ component("ash") {
|
||||
}
|
||||
|
||||
if (!use_ozone) {
|
||||
sources -= [
|
||||
"host/ash_window_tree_host_ozone.cc",
|
||||
]
|
||||
sources -= [ "host/ash_window_tree_host_ozone.cc" ]
|
||||
}
|
||||
}
|
||||
|
||||
@ -205,6 +201,7 @@ static_library("ash_shell_lib") {
|
||||
"//ash/strings",
|
||||
"//base",
|
||||
"//base:i18n",
|
||||
|
||||
#"//chrome:packed_resources", TODO(GYP)
|
||||
"//content",
|
||||
"//content/shell:content_shell_lib",
|
||||
@ -277,8 +274,10 @@ test("ash_unittests") {
|
||||
sources -= [
|
||||
# TODO(zork): fix this test to build on Windows. See: crosbug.com/26906
|
||||
"focus_cycler_unittest.cc",
|
||||
|
||||
# All tests for multiple displays: not supported on Windows Ash.
|
||||
"wm/drag_window_resizer_unittest.cc",
|
||||
|
||||
# Can't resize on Windows Ash. http://crbug.com/165962
|
||||
"magnifier/magnification_controller_unittest.cc",
|
||||
"wm/workspace/workspace_window_resizer_unittest.cc",
|
||||
@ -321,7 +320,7 @@ test("ash_unittests") {
|
||||
}
|
||||
|
||||
if (!use_x11 || !is_chromeos) {
|
||||
sources -= [ "touch/touch_transformer_controller_unittest.cc", ]
|
||||
sources -= [ "touch/touch_transformer_controller_unittest.cc" ]
|
||||
}
|
||||
|
||||
# TODO(GYP) is this necessary?
|
||||
@ -329,9 +328,7 @@ test("ash_unittests") {
|
||||
# ldflags = "-rdynamic"
|
||||
|
||||
if (!is_chromeos || use_ozone) {
|
||||
sources -= [
|
||||
"sticky_keys/sticky_keys_unittest.cc", # crbug.com/354035
|
||||
]
|
||||
sources -= [ "sticky_keys/sticky_keys_unittest.cc" ] # crbug.com/354035
|
||||
}
|
||||
}
|
||||
|
||||
@ -349,15 +346,11 @@ executable("ash_shell") {
|
||||
if (is_win) {
|
||||
configs -= [ "//build/config/win:console" ]
|
||||
configs += [ "//build/config/win:windowed" ]
|
||||
deps += [
|
||||
"//sandbox",
|
||||
]
|
||||
deps += [ "//sandbox" ]
|
||||
}
|
||||
|
||||
if (is_chromeos) {
|
||||
deps += [
|
||||
"//device/bluetooth",
|
||||
]
|
||||
deps += [ "//device/bluetooth" ]
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -30,7 +30,9 @@ if (is_win) {
|
||||
|
||||
action("prep_libc") {
|
||||
script = "prep_libc.py"
|
||||
outputs = [ "$target_gen_dir/allocator/libcmt.lib" ]
|
||||
outputs = [
|
||||
"$target_gen_dir/allocator/libcmt.lib",
|
||||
]
|
||||
args = [
|
||||
visual_studio_path + "/vc/lib",
|
||||
rebase_path("$target_gen_dir/allocator"),
|
||||
|
||||
@ -3,7 +3,10 @@
|
||||
# found in the LICENSE file.
|
||||
|
||||
config("tools_config") {
|
||||
include_dirs = [ "src", "src/third_party" ]
|
||||
include_dirs = [
|
||||
"src",
|
||||
"src/third_party",
|
||||
]
|
||||
if (is_android) {
|
||||
defines = [ "__ANDROID__" ]
|
||||
}
|
||||
@ -32,9 +35,7 @@ config("client_config") {
|
||||
}
|
||||
|
||||
config("handler_config") {
|
||||
include_dirs = [
|
||||
"src",
|
||||
]
|
||||
include_dirs = [ "src" ]
|
||||
}
|
||||
|
||||
# {micro,mini}dump_stackwalk and minidump_dump are tool-type executables that do
|
||||
@ -86,6 +87,7 @@ if (current_toolchain == host_toolchain && !is_win) {
|
||||
"src/processor/stackwalker_x86.h",
|
||||
"src/processor/tokenize.cc",
|
||||
"src/processor/tokenize.h",
|
||||
|
||||
# libdisasm
|
||||
"src/third_party/libdisasm/ia32_implicit.c",
|
||||
"src/third_party/libdisasm/ia32_implicit.h",
|
||||
@ -129,7 +131,9 @@ if (current_toolchain == host_toolchain && !is_win) {
|
||||
"src/processor/microdump_stackwalk.cc",
|
||||
]
|
||||
|
||||
deps = [ ":stackwalk_common" ]
|
||||
deps = [
|
||||
":stackwalk_common",
|
||||
]
|
||||
|
||||
defines = [ "BPLOG_MINIMUM_SEVERITY=SEVERITY_ERROR" ]
|
||||
|
||||
@ -146,7 +150,9 @@ if (current_toolchain == host_toolchain && !is_win) {
|
||||
"src/processor/minidump_stackwalk.cc",
|
||||
]
|
||||
|
||||
deps = [ ":stackwalk_common" ]
|
||||
deps = [
|
||||
":stackwalk_common",
|
||||
]
|
||||
|
||||
defines = [ "BPLOG_MINIMUM_SEVERITY=SEVERITY_ERROR" ]
|
||||
|
||||
@ -253,9 +259,7 @@ if (current_toolchain == host_toolchain && is_mac) {
|
||||
"src/tools/mac/symupload/symupload.m",
|
||||
]
|
||||
|
||||
include_dirs = [
|
||||
"src/common/mac"
|
||||
]
|
||||
include_dirs = [ "src/common/mac" ]
|
||||
|
||||
libs = [ "Foundation.framework" ]
|
||||
|
||||
@ -313,7 +317,7 @@ if (is_mac) {
|
||||
]
|
||||
|
||||
deps = [
|
||||
":utilities"
|
||||
":utilities",
|
||||
]
|
||||
}
|
||||
|
||||
@ -341,9 +345,7 @@ if (is_mac) {
|
||||
public_configs = [ ":breakpad_config" ]
|
||||
|
||||
defines = [ "USE_PROTECTED_ALLOCATIONS=1" ]
|
||||
include_dirs = [
|
||||
"src/client/apple/Framework",
|
||||
]
|
||||
include_dirs = [ "src/client/apple/Framework" ]
|
||||
|
||||
deps = [
|
||||
":utilities",
|
||||
@ -604,7 +606,6 @@ if (is_linux) {
|
||||
cflags = [ "-Wno-unused-value" ]
|
||||
}
|
||||
|
||||
|
||||
if (is_android) {
|
||||
sources += [ "src/common/android/breakpad_getcontext_unittest.cc" ]
|
||||
libs = [ "log" ]
|
||||
@ -621,16 +622,13 @@ if (is_linux) {
|
||||
":processor_support",
|
||||
]
|
||||
|
||||
include_dirs = [
|
||||
"src",
|
||||
]
|
||||
include_dirs = [ "src" ]
|
||||
|
||||
if (cpu_arch == "mipsel" && is_android) {
|
||||
include_dirs += [ "src/common/android/include" ]
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
executable("generate_test_dump") {
|
||||
testonly = true
|
||||
sources = [
|
||||
@ -641,7 +639,9 @@ if (is_linux) {
|
||||
configs -= [ "//build/config/compiler:chromium_code" ]
|
||||
configs += [ "//build/config/compiler:no_chromium_code" ]
|
||||
|
||||
deps = [ ":client" ]
|
||||
deps = [
|
||||
":client",
|
||||
]
|
||||
|
||||
include_dirs = [ "src" ]
|
||||
|
||||
@ -652,11 +652,15 @@ if (is_linux) {
|
||||
}
|
||||
|
||||
executable("minidump-2-core") {
|
||||
sources = [ "src/tools/linux/md2core/minidump-2-core.cc" ]
|
||||
sources = [
|
||||
"src/tools/linux/md2core/minidump-2-core.cc",
|
||||
]
|
||||
|
||||
include_dirs = [ "src" ]
|
||||
|
||||
deps = [ ":client" ]
|
||||
deps = [
|
||||
":client",
|
||||
]
|
||||
}
|
||||
|
||||
executable("core-2-minidump") {
|
||||
@ -726,7 +730,6 @@ if (is_ios) {
|
||||
"src/common/mac",
|
||||
]
|
||||
}
|
||||
|
||||
# TODO(GYP) There is some XCode-only targets like ninja-breakpad.
|
||||
}
|
||||
|
||||
|
||||
@ -95,12 +95,9 @@ if (is_android) {
|
||||
# Toolchain root directory for each build. The actual binaries are inside
|
||||
# a "bin" directory inside of these.
|
||||
_android_toolchain_version = "4.9"
|
||||
x86_android_toolchain_root =
|
||||
"$android_ndk_root/toolchains/x86-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
|
||||
arm_android_toolchain_root =
|
||||
"$android_ndk_root/toolchains/arm-linux-androideabi-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
|
||||
mips_android_toolchain_root =
|
||||
"$android_ndk_root/toolchains/mipsel-linux-android-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
|
||||
x86_android_toolchain_root = "$android_ndk_root/toolchains/x86-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
|
||||
arm_android_toolchain_root = "$android_ndk_root/toolchains/arm-linux-androideabi-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
|
||||
mips_android_toolchain_root = "$android_ndk_root/toolchains/mipsel-linux-android-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
|
||||
|
||||
# Location of libgcc. This is only needed for the current GN toolchain, so we
|
||||
# only need to define the current one, rather than one for every platform
|
||||
@ -109,20 +106,17 @@ if (is_android) {
|
||||
android_prebuilt_arch = "android-x86"
|
||||
_binary_prefix = "i686-linux-android"
|
||||
android_toolchain_root = "$x86_android_toolchain_root"
|
||||
android_libgcc_file =
|
||||
"$android_toolchain_root/lib/gcc/i686-linux-android/${_android_toolchain_version}/libgcc.a"
|
||||
android_libgcc_file = "$android_toolchain_root/lib/gcc/i686-linux-android/${_android_toolchain_version}/libgcc.a"
|
||||
} else if (cpu_arch == "arm") {
|
||||
android_prebuilt_arch = "android-arm"
|
||||
_binary_prefix = "arm-linux-androideabi"
|
||||
android_toolchain_root = "$arm_android_toolchain_root"
|
||||
android_libgcc_file =
|
||||
"$android_toolchain_root/lib/gcc/arm-linux-androideabi/${_android_toolchain_version}/libgcc.a"
|
||||
android_libgcc_file = "$android_toolchain_root/lib/gcc/arm-linux-androideabi/${_android_toolchain_version}/libgcc.a"
|
||||
} else if (cpu_arch == "mipsel") {
|
||||
android_prebuilt_arch = "android-mips"
|
||||
_binary_prefix = "mipsel-linux-android"
|
||||
android_toolchain_root = "$mips_android_toolchain_root"
|
||||
android_libgcc_file =
|
||||
"$android_toolchain_root/lib/gcc/mipsel-linux-android/${_android_toolchain_version}/libgcc.a"
|
||||
android_libgcc_file = "$android_toolchain_root/lib/gcc/mipsel-linux-android/${_android_toolchain_version}/libgcc.a"
|
||||
} else {
|
||||
assert(false, "Need android libgcc support for your target arch.")
|
||||
}
|
||||
|
||||
@ -333,7 +333,9 @@ template("process_java_prebuilt") {
|
||||
sources = [
|
||||
_input_jar_path,
|
||||
]
|
||||
outputs = [ _output_jar_path ]
|
||||
outputs = [
|
||||
_output_jar_path,
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@ -901,8 +903,12 @@ template("java_library_impl") {
|
||||
_final_deps += [ ":${_template_name}__standalone_dex" ]
|
||||
_rebased_build_config = rebase_path(_build_config, root_build_dir)
|
||||
dex("${_template_name}__standalone_dex") {
|
||||
sources = [_jar_path]
|
||||
inputs = [_build_config]
|
||||
sources = [
|
||||
_jar_path,
|
||||
]
|
||||
inputs = [
|
||||
_build_config,
|
||||
]
|
||||
output = invoker.standalone_dex_path
|
||||
dex_arg_key = "${_rebased_build_config}:final_dex:dependency_dex_files"
|
||||
args = [ "--inputs=@FileArg($dex_arg_key)" ]
|
||||
@ -1033,7 +1039,9 @@ template("copy_ex") {
|
||||
}
|
||||
|
||||
depfile = "$target_gen_dir/$target_name.d"
|
||||
outputs = [ depfile ]
|
||||
outputs = [
|
||||
depfile,
|
||||
]
|
||||
|
||||
args = [
|
||||
"--depfile",
|
||||
|
||||
@ -1312,7 +1312,9 @@ template("android_apk") {
|
||||
script = "//build/android/gyp/pack_arm_relocations.py"
|
||||
packed_libraries_dir = "$_native_libs_dir/$android_app_abi"
|
||||
depfile = "$target_gen_dir/$target_name.d"
|
||||
outputs = [ depfile ]
|
||||
outputs = [
|
||||
depfile,
|
||||
]
|
||||
inputs = [
|
||||
_build_config,
|
||||
]
|
||||
@ -1440,8 +1442,7 @@ template("unittest_apk") {
|
||||
android_apk(target_name) {
|
||||
_apk_name = test_suite_name
|
||||
final_apk_path = "$root_build_dir/${_apk_name}_apk/${_apk_name}-debug.apk"
|
||||
java_files =
|
||||
[ "//testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java" ]
|
||||
java_files = [ "//testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java" ]
|
||||
android_manifest = "//testing/android/java/AndroidManifest.xml"
|
||||
native_libs = [ unittests_binary ]
|
||||
deps = [
|
||||
|
||||
@ -39,7 +39,9 @@ template("go_test_binary") {
|
||||
":$static_library_name",
|
||||
]
|
||||
script = "//build/go/go.py"
|
||||
outputs = [ "${target_out_dir}/${target_name}" ]
|
||||
outputs = [
|
||||
"${target_out_dir}/${target_name}",
|
||||
]
|
||||
|
||||
# Since go test does not permit specifying an output directory or output
|
||||
# binary name, we create a temporary build directory, and the python
|
||||
@ -79,7 +81,9 @@ template("go_shared_library") {
|
||||
":$static_library_name",
|
||||
]
|
||||
script = "//build/go/go.py"
|
||||
outputs = [ "${target_out_dir}/${target_name}" ]
|
||||
outputs = [
|
||||
"${target_out_dir}/${target_name}",
|
||||
]
|
||||
|
||||
# Since go test does not permit specifying an output directory or output
|
||||
# binary name, we create a temporary build directory, and the python
|
||||
|
||||
@ -44,8 +44,7 @@ android_java_prebuilt("android_support_v7_appcompat_java") {
|
||||
deps = [
|
||||
":android_support_v7_appcompat_resources",
|
||||
]
|
||||
jar_path =
|
||||
"$android_sdk_root/extras/android/support/v7/appcompat/libs/android-support-v7-appcompat.jar"
|
||||
jar_path = "$android_sdk_root/extras/android/support/v7/appcompat/libs/android-support-v7-appcompat.jar"
|
||||
}
|
||||
|
||||
android_resources("android_support_v7_mediarouter_resources") {
|
||||
@ -63,6 +62,5 @@ android_java_prebuilt("android_support_v7_mediarouter_java") {
|
||||
":android_support_v7_mediarouter_resources",
|
||||
":android_support_v7_appcompat_java",
|
||||
]
|
||||
jar_path =
|
||||
"$android_sdk_root/extras/android/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar"
|
||||
jar_path = "$android_sdk_root/extras/android/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar"
|
||||
}
|
||||
|
||||
8
build/secondary/third_party/icu/BUILD.gn
vendored
8
build/secondary/third_party/icu/BUILD.gn
vendored
@ -481,7 +481,9 @@ if (icu_use_data_file) {
|
||||
]
|
||||
}
|
||||
|
||||
outputs = [ "$root_out_dir/icudtl.dat" ]
|
||||
outputs = [
|
||||
"$root_out_dir/icudtl.dat",
|
||||
]
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@ -491,7 +493,9 @@ if (icu_use_data_file) {
|
||||
sources = [
|
||||
"windows/icudt.dll",
|
||||
]
|
||||
outputs = [ "$root_out_dir/icudt.dll" ]
|
||||
outputs = [
|
||||
"$root_out_dir/icudt.dll",
|
||||
]
|
||||
}
|
||||
} else {
|
||||
source_set("icudata") {
|
||||
|
||||
@ -15,7 +15,9 @@ action("grit_sources") {
|
||||
|
||||
# Note that we can't call this "grit_sources.stamp" because that file is
|
||||
# implicitly created by GN for script actions.
|
||||
outputs = [ "$target_out_dir/grit_sources.script.stamp" ]
|
||||
outputs = [
|
||||
"$target_out_dir/grit_sources.script.stamp",
|
||||
]
|
||||
|
||||
args = [
|
||||
rebase_path("//tools/grit", root_build_dir),
|
||||
|
||||
@ -29,7 +29,9 @@ template("repack") {
|
||||
script = "//tools/grit/grit/format/repack.py"
|
||||
|
||||
inputs = invoker.sources
|
||||
outputs = [ invoker.output ]
|
||||
outputs = [
|
||||
invoker.output,
|
||||
]
|
||||
|
||||
args = []
|
||||
if (defined(invoker.repack_options)) {
|
||||
|
||||
@ -65,8 +65,7 @@ template("android_gcc_toolchain") {
|
||||
mkdir_command = "mkdir -p lib.stripped"
|
||||
strip_command =
|
||||
"$android_strip --strip-unneeded -o $temp_stripped_soname $soname"
|
||||
replace_command =
|
||||
"if ! cmp -s $temp_stripped_soname $stripped_soname; then mv $temp_stripped_soname $stripped_soname; fi"
|
||||
replace_command = "if ! cmp -s $temp_stripped_soname $stripped_soname; then mv $temp_stripped_soname $stripped_soname; fi"
|
||||
postsolink = "$mkdir_command && $strip_command && $replace_command"
|
||||
solink_outputs = [ stripped_soname ]
|
||||
|
||||
|
||||
@ -84,33 +84,33 @@ template("gcc_toolchain") {
|
||||
|
||||
tool("cc") {
|
||||
depfile = "{{output}}.d"
|
||||
command =
|
||||
"$cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} -c {{source}} -o {{output}}"
|
||||
command = "$cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} -c {{source}} -o {{output}}"
|
||||
depsformat = "gcc"
|
||||
description = "CC {{output}}"
|
||||
outputs =
|
||||
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ]
|
||||
outputs = [
|
||||
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
|
||||
]
|
||||
}
|
||||
|
||||
tool("cxx") {
|
||||
depfile = "{{output}}.d"
|
||||
command =
|
||||
"$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} -c {{source}} -o {{output}}"
|
||||
command = "$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} -c {{source}} -o {{output}}"
|
||||
depsformat = "gcc"
|
||||
description = "CXX {{output}}"
|
||||
outputs =
|
||||
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ]
|
||||
outputs = [
|
||||
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
|
||||
]
|
||||
}
|
||||
|
||||
tool("asm") {
|
||||
# For GCC we can just use the C compiler to compile assembly.
|
||||
depfile = "{{output}}.d"
|
||||
command =
|
||||
"$cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} -c {{source}} -o {{output}}"
|
||||
command = "$cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} -c {{source}} -o {{output}}"
|
||||
depsformat = "gcc"
|
||||
description = "ASM {{output}}"
|
||||
outputs =
|
||||
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ]
|
||||
outputs = [
|
||||
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
|
||||
]
|
||||
}
|
||||
|
||||
tool("alink") {
|
||||
@ -118,8 +118,9 @@ template("gcc_toolchain") {
|
||||
command = "rm -f {{output}} && $ar rcs {{output}} @$rspfile"
|
||||
description = "AR {{output}}"
|
||||
rspfile_content = "{{inputs}}"
|
||||
outputs =
|
||||
[ "{{target_out_dir}}/{{target_output_name}}{{output_extension}}" ]
|
||||
outputs = [
|
||||
"{{target_out_dir}}/{{target_output_name}}{{output_extension}}",
|
||||
]
|
||||
default_output_extension = ".a"
|
||||
output_prefix = "lib"
|
||||
}
|
||||
@ -137,17 +138,14 @@ template("gcc_toolchain") {
|
||||
temporary_tocname = sofile + ".tmp"
|
||||
link_command =
|
||||
"$ld -shared {{ldflags}} -o $sofile -Wl,-soname=$soname @$rspfile"
|
||||
toc_command =
|
||||
"{ readelf -d $sofile | grep SONAME ; nm -gD -f p $soname | cut -f1-2 -d' '; } > $temporary_tocname"
|
||||
replace_command =
|
||||
"if ! cmp -s $temporary_tocname $tocfile; then mv $temporary_tocname $tocfile; fi"
|
||||
toc_command = "{ readelf -d $sofile | grep SONAME ; nm -gD -f p $soname | cut -f1-2 -d' '; } > $temporary_tocname"
|
||||
replace_command = "if ! cmp -s $temporary_tocname $tocfile; then mv $temporary_tocname $tocfile; fi"
|
||||
|
||||
command = "$link_command && $toc_command && $replace_command"
|
||||
if (defined(invoker.postsolink)) {
|
||||
command += " && " + invoker.postsolink
|
||||
}
|
||||
rspfile_content =
|
||||
"-Wl,--whole-archive {{inputs}} {{solibs}} -Wl,--no-whole-archive $solink_libs_section_prefix {{libs}} $solink_libs_section_postfix"
|
||||
rspfile_content = "-Wl,--whole-archive {{inputs}} {{solibs}} -Wl,--no-whole-archive $solink_libs_section_prefix {{libs}} $solink_libs_section_postfix"
|
||||
|
||||
description = "SOLINK $sofile"
|
||||
|
||||
@ -179,14 +177,15 @@ template("gcc_toolchain") {
|
||||
tool("link") {
|
||||
outfile = "{{root_out_dir}}/{{target_output_name}}{{output_extension}}"
|
||||
rspfile = "$outfile.rsp"
|
||||
command =
|
||||
"$ld {{ldflags}} -o $outfile -Wl,--start-group @$rspfile {{solibs}} -Wl,--end-group $libs_section_prefix {{libs}} $libs_section_postfix"
|
||||
command = "$ld {{ldflags}} -o $outfile -Wl,--start-group @$rspfile {{solibs}} -Wl,--end-group $libs_section_prefix {{libs}} $libs_section_postfix"
|
||||
if (defined(invoker.postlink)) {
|
||||
command += " && " + invoker.postlink
|
||||
}
|
||||
description = "LINK $outfile"
|
||||
rspfile_content = "{{inputs}}"
|
||||
outputs = [ outfile ]
|
||||
outputs = [
|
||||
outfile,
|
||||
]
|
||||
if (defined(invoker.link_outputs)) {
|
||||
outputs += invoker.link_outputs
|
||||
}
|
||||
@ -198,8 +197,7 @@ template("gcc_toolchain") {
|
||||
}
|
||||
|
||||
tool("copy") {
|
||||
command =
|
||||
"ln -f {{source}} {{output}} 2>/dev/null || (rm -rf {{output}} && cp -af {{source}} {{output}})"
|
||||
command = "ln -f {{source}} {{output}} 2>/dev/null || (rm -rf {{output}} && cp -af {{source}} {{output}})"
|
||||
description = "COPY {{source}} {{output}}"
|
||||
}
|
||||
|
||||
|
||||
@ -57,61 +57,61 @@ template("mac_clang_toolchain") {
|
||||
|
||||
tool("cc") {
|
||||
depfile = "{{output}}.d"
|
||||
command =
|
||||
"$cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} -c {{source}} -o {{output}}"
|
||||
command = "$cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} -c {{source}} -o {{output}}"
|
||||
depsformat = "gcc"
|
||||
description = "CC {{output}}"
|
||||
outputs =
|
||||
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ]
|
||||
outputs = [
|
||||
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
|
||||
]
|
||||
}
|
||||
|
||||
tool("cxx") {
|
||||
depfile = "{{output}}.d"
|
||||
command =
|
||||
"$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} -c {{source}} -o {{output}}"
|
||||
command = "$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} -c {{source}} -o {{output}}"
|
||||
depsformat = "gcc"
|
||||
description = "CXX {{output}}"
|
||||
outputs =
|
||||
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ]
|
||||
outputs = [
|
||||
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
|
||||
]
|
||||
}
|
||||
|
||||
tool("asm") {
|
||||
# For GCC we can just use the C compiler to compile assembly.
|
||||
depfile = "{{output}}.d"
|
||||
command =
|
||||
"$cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} -c {{source}} -o {{output}}"
|
||||
command = "$cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} -c {{source}} -o {{output}}"
|
||||
depsformat = "gcc"
|
||||
description = "ASM {{output}}"
|
||||
outputs =
|
||||
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ]
|
||||
outputs = [
|
||||
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
|
||||
]
|
||||
}
|
||||
|
||||
tool("objc") {
|
||||
depfile = "{{output}}.d"
|
||||
command =
|
||||
"$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} {{cflags_objc}} -c {{source}} -o {{output}}"
|
||||
command = "$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} {{cflags_objc}} -c {{source}} -o {{output}}"
|
||||
depsformat = "gcc"
|
||||
description = "OBJC {{output}}"
|
||||
outputs =
|
||||
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ]
|
||||
outputs = [
|
||||
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
|
||||
]
|
||||
}
|
||||
|
||||
tool("objcxx") {
|
||||
depfile = "{{output}}.d"
|
||||
command =
|
||||
"$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} {{cflags_objcc}} -c {{source}} -o {{output}}"
|
||||
command = "$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} {{cflags_objcc}} -c {{source}} -o {{output}}"
|
||||
depsformat = "gcc"
|
||||
description = "OBJCXX {{output}}"
|
||||
outputs =
|
||||
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ]
|
||||
outputs = [
|
||||
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o",
|
||||
]
|
||||
}
|
||||
|
||||
tool("alink") {
|
||||
command =
|
||||
"rm -f {{output}} && ./gyp-mac-tool filter-libtool libtool -static -o {{output}} {{inputs}}"
|
||||
command = "rm -f {{output}} && ./gyp-mac-tool filter-libtool libtool -static -o {{output}} {{inputs}}"
|
||||
description = "LIBTOOL-STATIC {{output}}"
|
||||
outputs =
|
||||
[ "{{target_out_dir}}/{{target_output_name}}{{output_extension}}" ]
|
||||
outputs = [
|
||||
"{{target_out_dir}}/{{target_output_name}}{{output_extension}}",
|
||||
]
|
||||
default_output_extension = ".a"
|
||||
output_prefix = "lib"
|
||||
}
|
||||
@ -131,17 +131,12 @@ template("mac_clang_toolchain") {
|
||||
tocname = dylib + ".TOC"
|
||||
temporary_tocname = dylib + ".tmp"
|
||||
|
||||
does_reexport_command =
|
||||
"[ ! -e $dylib -o ! -e $tocname ] || otool -l $dylib | grep -q LC_REEXPORT_DYLIB"
|
||||
link_command =
|
||||
"$ld -shared {{ldflags}} -o $dylib -Wl,-filelist,$rspfile {{solibs}} {{libs}}"
|
||||
replace_command =
|
||||
"if ! cmp -s $temporary_tocname $tocname; then mv $temporary_tocname $tocname"
|
||||
extract_toc_command =
|
||||
"{ otool -l $dylib | grep LC_ID_DYLIB -A 5; nm -gP $dylib | cut -f1-2 -d' ' | grep -v U\$\$; true; }"
|
||||
does_reexport_command = "[ ! -e $dylib -o ! -e $tocname ] || otool -l $dylib | grep -q LC_REEXPORT_DYLIB"
|
||||
link_command = "$ld -shared {{ldflags}} -o $dylib -Wl,-filelist,$rspfile {{solibs}} {{libs}}"
|
||||
replace_command = "if ! cmp -s $temporary_tocname $tocname; then mv $temporary_tocname $tocname"
|
||||
extract_toc_command = "{ otool -l $dylib | grep LC_ID_DYLIB -A 5; nm -gP $dylib | cut -f1-2 -d' ' | grep -v U\$\$; true; }"
|
||||
|
||||
command =
|
||||
"if $does_reexport_command ; then $link_command && $extract_toc_command > $tocname; else $link_command && $extract_toc_command > $temporary_tocname && $replace_command ; fi; fi"
|
||||
command = "if $does_reexport_command ; then $link_command && $extract_toc_command > $tocname; else $link_command && $extract_toc_command > $temporary_tocname && $replace_command ; fi; fi"
|
||||
|
||||
rspfile_content = "{{inputs_newline}}"
|
||||
|
||||
@ -172,11 +167,12 @@ template("mac_clang_toolchain") {
|
||||
tool("link") {
|
||||
outfile = "{{root_out_dir}}/{{target_output_name}}{{output_extension}}"
|
||||
rspfile = "$outfile.rsp"
|
||||
command =
|
||||
"$ld {{ldflags}} -o $outfile -Wl,-filelist,$rspfile {{solibs}} {{libs}}"
|
||||
command = "$ld {{ldflags}} -o $outfile -Wl,-filelist,$rspfile {{solibs}} {{libs}}"
|
||||
description = "LINK $outfile"
|
||||
rspfile_content = "{{inputs_newline}}"
|
||||
outputs = [ outfile ]
|
||||
outputs = [
|
||||
outfile,
|
||||
]
|
||||
}
|
||||
|
||||
tool("stamp") {
|
||||
@ -185,8 +181,7 @@ template("mac_clang_toolchain") {
|
||||
}
|
||||
|
||||
tool("copy") {
|
||||
command =
|
||||
"ln -f {{source}} {{output}} 2>/dev/null || (rm -rf {{output}} && cp -af {{source}} {{output}})"
|
||||
command = "ln -f {{source}} {{output}} 2>/dev/null || (rm -rf {{output}} && cp -af {{source}} {{output}})"
|
||||
description = "COPY {{source}} {{output}}"
|
||||
}
|
||||
|
||||
|
||||
@ -9,16 +9,14 @@ toolchain("x86_newlib") {
|
||||
ld = toolprefix + "g++"
|
||||
|
||||
tool("cc") {
|
||||
command =
|
||||
"$cc -MMD -MF \$out.d \$defines \$includes \$cflags \$cflags_c -c \$in -o \$out"
|
||||
command = "$cc -MMD -MF \$out.d \$defines \$includes \$cflags \$cflags_c -c \$in -o \$out"
|
||||
description = "CC(NaCl x86 Newlib) \$out"
|
||||
depfile = "\$out.d"
|
||||
depsformat = "gcc"
|
||||
}
|
||||
tool("cxx") {
|
||||
# cflags_pch_cc
|
||||
command =
|
||||
"$cxx -MMD -MF \$out.d \$defines \$includes \$cflags \$cflags_cc -c \$in -o \$out"
|
||||
command = "$cxx -MMD -MF \$out.d \$defines \$includes \$cflags \$cflags_cc -c \$in -o \$out"
|
||||
description = "CXX(NaCl x86 Newlib) \$out"
|
||||
depfile = "\$out.d"
|
||||
depsformat = "gcc"
|
||||
@ -28,16 +26,14 @@ toolchain("x86_newlib") {
|
||||
description = "AR(NaCl x86 Newlib) \$out"
|
||||
}
|
||||
tool("solink") {
|
||||
command =
|
||||
"if [ ! -e \$lib -o ! -e \${lib}.TOC ]; then $ld -shared \$ldflags -o \$lib -Wl,-soname=\$soname -Wl,--whole-archive \$in \$solibs -Wl,--no-whole-archive \$libs && { readelf -d \${lib} | grep SONAME ; nm -gD -f p \${lib} | cut -f1-2 -d' '; } > \${lib}.TOC; else $ld -shared \$ldflags -o \$lib -Wl,-soname=\$soname -Wl,--whole-archive \$in \$solibs -Wl,--no-whole-archive \$libs && { readelf -d \${lib} | grep SONAME ; nm -gD -f p \${lib} | cut -f1-2 -d' '; } > \${lib}.tmp && if ! cmp -s \${lib}.tmp \${lib}.TOC; then mv \${lib}.tmp \${lib}.TOC ; fi; fi"
|
||||
command = "if [ ! -e \$lib -o ! -e \${lib}.TOC ]; then $ld -shared \$ldflags -o \$lib -Wl,-soname=\$soname -Wl,--whole-archive \$in \$solibs -Wl,--no-whole-archive \$libs && { readelf -d \${lib} | grep SONAME ; nm -gD -f p \${lib} | cut -f1-2 -d' '; } > \${lib}.TOC; else $ld -shared \$ldflags -o \$lib -Wl,-soname=\$soname -Wl,--whole-archive \$in \$solibs -Wl,--no-whole-archive \$libs && { readelf -d \${lib} | grep SONAME ; nm -gD -f p \${lib} | cut -f1-2 -d' '; } > \${lib}.tmp && if ! cmp -s \${lib}.tmp \${lib}.TOC; then mv \${lib}.tmp \${lib}.TOC ; fi; fi"
|
||||
description = "SOLINK(NaCl x86 Newlib) \$lib"
|
||||
|
||||
#pool = "link_pool"
|
||||
restat = "1"
|
||||
}
|
||||
tool("link") {
|
||||
command =
|
||||
"$ld \$ldflags -o \$out -Wl,--start-group \$in \$solibs -Wl,--end-group \$libs"
|
||||
command = "$ld \$ldflags -o \$out -Wl,--start-group \$in \$solibs -Wl,--end-group \$libs"
|
||||
description = "LINK(NaCl x86 Newlib) \$out"
|
||||
|
||||
#pool = "link_pool"
|
||||
|
||||
@ -81,12 +81,12 @@ template("msvc_toolchain") {
|
||||
tool("cc") {
|
||||
rspfile = "{{output}}.rsp"
|
||||
pdbname = "{{target_out_dir}}/{{target_output_name}}_c.pdb"
|
||||
command =
|
||||
"ninja -t msvc -e $env -- $cl /nologo /showIncludes /FC @$rspfile /c {{source}} /Fo{{output}} /Fd$pdbname"
|
||||
command = "ninja -t msvc -e $env -- $cl /nologo /showIncludes /FC @$rspfile /c {{source}} /Fo{{output}} /Fd$pdbname"
|
||||
depsformat = "msvc"
|
||||
description = "CC {{output}}"
|
||||
outputs =
|
||||
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj" ]
|
||||
outputs = [
|
||||
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj",
|
||||
]
|
||||
rspfile_content = "{{defines}} {{include_dirs}} {{cflags}} {{cflags_c}}"
|
||||
}
|
||||
|
||||
@ -95,37 +95,36 @@ template("msvc_toolchain") {
|
||||
|
||||
# The PDB name needs to be different between C and C++ compiled files.
|
||||
pdbname = "{{target_out_dir}}/{{target_output_name}}_cc.pdb"
|
||||
command =
|
||||
"ninja -t msvc -e $env -- $cl /nologo /showIncludes /FC @$rspfile /c {{source}} /Fo{{output}} /Fd$pdbname"
|
||||
command = "ninja -t msvc -e $env -- $cl /nologo /showIncludes /FC @$rspfile /c {{source}} /Fo{{output}} /Fd$pdbname"
|
||||
depsformat = "msvc"
|
||||
description = "CXX {{output}}"
|
||||
outputs =
|
||||
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj" ]
|
||||
outputs = [
|
||||
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj",
|
||||
]
|
||||
rspfile_content = "{{defines}} {{include_dirs}} {{cflags}} {{cflags_c}}"
|
||||
}
|
||||
|
||||
tool("rc") {
|
||||
command =
|
||||
"$python_path gyp-win-tool rc-wrapper $env rc.exe {{defines}} {{include_dirs}} /fo{{output}} {{source}}"
|
||||
outputs =
|
||||
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.res" ]
|
||||
command = "$python_path gyp-win-tool rc-wrapper $env rc.exe {{defines}} {{include_dirs}} /fo{{output}} {{source}}"
|
||||
outputs = [
|
||||
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.res",
|
||||
]
|
||||
description = "RC {{output}}"
|
||||
}
|
||||
|
||||
tool("asm") {
|
||||
# TODO(brettw): "/safeseh" assembler argument is hardcoded here. Extract
|
||||
# assembler flags to a variable like cflags. crbug.com/418613
|
||||
command =
|
||||
"$python_path gyp-win-tool asm-wrapper $env ml.exe {{defines}} {{include_dirs}} /safeseh /c /Fo {{output}} {{source}}"
|
||||
command = "$python_path gyp-win-tool asm-wrapper $env ml.exe {{defines}} {{include_dirs}} /safeseh /c /Fo {{output}} {{source}}"
|
||||
description = "ASM {{output}}"
|
||||
outputs =
|
||||
[ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj" ]
|
||||
outputs = [
|
||||
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj",
|
||||
]
|
||||
}
|
||||
|
||||
tool("alink") {
|
||||
rspfile = "{{output}}.rsp"
|
||||
command =
|
||||
"$python_path gyp-win-tool link-wrapper $env False lib.exe /nologo /ignore:4221 /OUT:{{output}} @$rspfile"
|
||||
command = "$python_path gyp-win-tool link-wrapper $env False lib.exe /nologo /ignore:4221 /OUT:{{output}} @$rspfile"
|
||||
description = "LIB {{output}}"
|
||||
outputs = [
|
||||
# Ignore {{output_extension}} and always use .lib, there's no reason to
|
||||
@ -145,8 +144,7 @@ template("msvc_toolchain") {
|
||||
"{{root_out_dir}}/{{target_output_name}}{{output_extension}}.lib" # e.g. foo.dll.lib
|
||||
rspfile = "${dllname}.rsp"
|
||||
|
||||
link_command =
|
||||
"$python_path gyp-win-tool link-wrapper $env False link.exe /nologo /IMPLIB:$libname /DLL /OUT:$dllname /PDB:${dllname}.pdb @$rspfile"
|
||||
link_command = "$python_path gyp-win-tool link-wrapper $env False link.exe /nologo /IMPLIB:$libname /DLL /OUT:$dllname /PDB:${dllname}.pdb @$rspfile"
|
||||
|
||||
# TODO(brettw) support manifests
|
||||
#manifest_command = "$python_path gyp-win-tool manifest-wrapper $env mt.exe -nologo -manifest $manifests -out:${dllname}.manifest"
|
||||
@ -170,8 +168,7 @@ template("msvc_toolchain") {
|
||||
tool("link") {
|
||||
rspfile = "{{output}}.rsp"
|
||||
|
||||
link_command =
|
||||
"$python_path gyp-win-tool link-wrapper $env False link.exe /nologo /OUT:{{output}} /PDB:{{output}}.pdb @$rspfile"
|
||||
link_command = "$python_path gyp-win-tool link-wrapper $env False link.exe /nologo /OUT:{{output}} /PDB:{{output}}.pdb @$rspfile"
|
||||
|
||||
# TODO(brettw) support manifests
|
||||
#manifest_command = "$python_path gyp-win-tool manifest-wrapper $env mt.exe -nologo -manifest $manifests -out:{{output}}.manifest"
|
||||
@ -180,8 +177,9 @@ template("msvc_toolchain") {
|
||||
|
||||
default_output_extension = ".exe"
|
||||
description = "LINK {{output}}"
|
||||
outputs =
|
||||
[ "{{root_out_dir}}/{{target_output_name}}{{output_extension}}" ]
|
||||
outputs = [
|
||||
"{{root_out_dir}}/{{target_output_name}}{{output_extension}}",
|
||||
]
|
||||
|
||||
# The use of inputs_newline is to work around a fixed per-line buffer
|
||||
# size in the linker.
|
||||
|
||||
@ -15,7 +15,9 @@ action("webkit_version") {
|
||||
]
|
||||
|
||||
output_file = "$root_gen_dir/webkit_version.h"
|
||||
outputs = [ output_file ]
|
||||
outputs = [
|
||||
output_file,
|
||||
]
|
||||
|
||||
args = [
|
||||
"-f",
|
||||
|
||||
@ -7,7 +7,9 @@ source_set("surface_id") {
|
||||
"surface_id.h",
|
||||
]
|
||||
|
||||
deps = [ "//base" ]
|
||||
deps = [
|
||||
"//base",
|
||||
]
|
||||
}
|
||||
|
||||
component("surfaces") {
|
||||
@ -50,4 +52,3 @@ component("surfaces") {
|
||||
configs += [ "//build/config/compiler:optimize_max" ]
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -8,17 +8,16 @@ import("//third_party/protobuf/proto_library.gni")
|
||||
|
||||
assert(is_chromeos, "Non-ChromeOS builds must not depend on //chromeos")
|
||||
|
||||
gypi_values = exec_script(
|
||||
"//build/gypi_to_gn.py",
|
||||
[ rebase_path("chromeos.gyp") ],
|
||||
"scope",
|
||||
[ "chromeos.gyp" ])
|
||||
gypi_values = exec_script("//build/gypi_to_gn.py",
|
||||
[ rebase_path("chromeos.gyp") ],
|
||||
"scope",
|
||||
[ "chromeos.gyp" ])
|
||||
|
||||
component("chromeos") {
|
||||
configs += [
|
||||
"//net/third_party/nss/ssl:ssl_config",
|
||||
configs += [ "//net/third_party/nss/ssl:ssl_config" ]
|
||||
public_deps = [
|
||||
"//dbus",
|
||||
]
|
||||
public_deps = [ "//dbus" ]
|
||||
deps = [
|
||||
"//base",
|
||||
"//base:prefs",
|
||||
@ -35,7 +34,7 @@ component("chromeos") {
|
||||
"//ui/accelerometer",
|
||||
"//url",
|
||||
":cryptohome_proto",
|
||||
":power_manager_proto"
|
||||
":power_manager_proto",
|
||||
]
|
||||
sources = gypi_values.chromeos_sources
|
||||
defines = [ "CHROMEOS_IMPLEMENTATION" ]
|
||||
@ -43,9 +42,7 @@ component("chromeos") {
|
||||
|
||||
static_library("test_support") {
|
||||
testonly = true
|
||||
configs += [
|
||||
"//build/config/linux:dbus",
|
||||
]
|
||||
configs += [ "//build/config/linux:dbus" ]
|
||||
deps = [
|
||||
"//testing/gmock",
|
||||
":chromeos",
|
||||
@ -99,9 +96,7 @@ static_library("test_support") {
|
||||
|
||||
static_library("test_support_without_gmock") {
|
||||
testonly = true
|
||||
configs += [
|
||||
"//build/config/linux:dbus",
|
||||
]
|
||||
configs += [ "//build/config/linux:dbus" ]
|
||||
deps = [
|
||||
"//crypto",
|
||||
":chromeos",
|
||||
|
||||
@ -4,9 +4,11 @@
|
||||
|
||||
action("gencode") {
|
||||
script = "gen_input_methods.py"
|
||||
sources = [ "//chromeos/ime/input_methods.txt" ]
|
||||
sources = [
|
||||
"//chromeos/ime/input_methods.txt",
|
||||
]
|
||||
outputs = [
|
||||
"$target_gen_dir/input_methods.h"
|
||||
"$target_gen_dir/input_methods.h",
|
||||
]
|
||||
args = [
|
||||
rebase_path("//chromeos/ime/input_methods.txt"),
|
||||
|
||||
@ -23,7 +23,9 @@ action("regexes") {
|
||||
inputs = [
|
||||
"autofill_regex_constants.cc.utf8",
|
||||
]
|
||||
outputs = [ "$target_gen_dir/autofill_regex_constants.cc" ]
|
||||
outputs = [
|
||||
"$target_gen_dir/autofill_regex_constants.cc",
|
||||
]
|
||||
|
||||
args = [
|
||||
"-o",
|
||||
|
||||
@ -40,5 +40,7 @@ java_cpp_enum("bookmark_type_javagen") {
|
||||
sources = [
|
||||
"bookmark_type.h",
|
||||
]
|
||||
outputs = [ "org/chromium/components/bookmarks/BookmarkType.java" ]
|
||||
outputs = [
|
||||
"org/chromium/components/bookmarks/BookmarkType.java",
|
||||
]
|
||||
}
|
||||
|
||||
@ -39,7 +39,9 @@ template("process_version") {
|
||||
invoker.source,
|
||||
]
|
||||
|
||||
outputs = [ invoker.output ]
|
||||
outputs = [
|
||||
invoker.output,
|
||||
]
|
||||
|
||||
args = [
|
||||
"-f",
|
||||
|
||||
@ -22,7 +22,9 @@ action("bake_in_configs") {
|
||||
script = "bake_in_configs.py"
|
||||
|
||||
inputs = baked_in_configs
|
||||
outputs = [ "$target_gen_dir/baked_in_configs.cc" ]
|
||||
outputs = [
|
||||
"$target_gen_dir/baked_in_configs.cc",
|
||||
]
|
||||
|
||||
# The actual list of JSON files will overflow the command line length limit
|
||||
# on Windows, so pass the name of the .gypi file and bake_in_configs.py will
|
||||
|
||||
@ -20,7 +20,9 @@ action("generate_tracing_grd") {
|
||||
"$tracing_gen_dir/about_tracing.js",
|
||||
]
|
||||
inputs = input_pages
|
||||
outputs = [ tracing_grd ]
|
||||
outputs = [
|
||||
tracing_grd,
|
||||
]
|
||||
|
||||
args = rebase_path(input_pages, target_gen_dir) + [
|
||||
"--output",
|
||||
|
||||
@ -368,7 +368,9 @@ copy("copy_shell_resources") {
|
||||
sources = [
|
||||
"$target_gen_dir/shell_resources.pak",
|
||||
]
|
||||
outputs = [ "$root_out_dir/shell_resources.pak" ]
|
||||
outputs = [
|
||||
"$root_out_dir/shell_resources.pak",
|
||||
]
|
||||
|
||||
public_deps = [
|
||||
":content_shell_resources_grit",
|
||||
@ -382,7 +384,9 @@ if (!is_mac) {
|
||||
sources = [
|
||||
"renderer/test_runner/resources/fonts/AHEM____.TTF",
|
||||
]
|
||||
outputs = [ "$root_out_dir/AHEM____.TTF" ]
|
||||
outputs = [
|
||||
"$root_out_dir/AHEM____.TTF",
|
||||
]
|
||||
}
|
||||
}
|
||||
if (use_x11) {
|
||||
@ -393,7 +397,9 @@ if (use_x11) {
|
||||
"//third_party/gardiner_mod/GardinerModBug.ttf",
|
||||
"//third_party/gardiner_mod/GardinerModCat.ttf",
|
||||
]
|
||||
outputs = [ "$root_out_dir/{{source_file_part}}" ]
|
||||
outputs = [
|
||||
"$root_out_dir/{{source_file_part}}",
|
||||
]
|
||||
}
|
||||
}
|
||||
if (is_android) {
|
||||
@ -403,7 +409,9 @@ if (is_android) {
|
||||
"renderer/test_runner/resources/fonts/android_main_fonts.xml",
|
||||
"renderer/test_runner/resources/fonts/android_fallback_fonts.xml",
|
||||
]
|
||||
outputs = [ "$root_out_dir/{{source_file_part}}" ]
|
||||
outputs = [
|
||||
"$root_out_dir/{{source_file_part}}",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -185,5 +185,4 @@ if (!is_ios) {
|
||||
}
|
||||
}
|
||||
} # !is_ios
|
||||
|
||||
# TODO(GYP): Unit test targets
|
||||
|
||||
@ -102,7 +102,7 @@ test("courgette_unittests") {
|
||||
"streams_unittest.cc",
|
||||
"typedrva_unittest.cc",
|
||||
"versioning_unittest.cc",
|
||||
"third_party/paged_array_unittest.cc"
|
||||
"third_party/paged_array_unittest.cc",
|
||||
]
|
||||
|
||||
if (is_win) {
|
||||
|
||||
@ -40,6 +40,7 @@ component("crypto") {
|
||||
"hmac_openssl.cc",
|
||||
"mac_security_services_lock.cc",
|
||||
"mac_security_services_lock.h",
|
||||
|
||||
# TODO(brettw) these mocks should be moved to a test_support_crypto target
|
||||
# if possible.
|
||||
"mock_apple_keychain.cc",
|
||||
@ -232,9 +233,7 @@ if (!is_win) {
|
||||
]
|
||||
|
||||
if (use_openssl || !is_linux) {
|
||||
sources -= [
|
||||
"rsa_private_key_nss_unittest.cc",
|
||||
]
|
||||
sources -= [ "rsa_private_key_nss_unittest.cc" ]
|
||||
}
|
||||
|
||||
if (use_openssl) {
|
||||
@ -293,9 +292,13 @@ source_set("test_support") {
|
||||
# on the current SSL library should just depend on this.
|
||||
group("platform") {
|
||||
if (use_openssl) {
|
||||
deps = [ "//third_party/boringssl" ]
|
||||
deps = [
|
||||
"//third_party/boringssl",
|
||||
]
|
||||
} else {
|
||||
deps = [ "//net/third_party/nss/ssl:libssl" ]
|
||||
deps = [
|
||||
"//net/third_party/nss/ssl:libssl",
|
||||
]
|
||||
if (is_linux) {
|
||||
# On Linux, we use the system NSS (excepting SSL where we always use our
|
||||
# own).
|
||||
|
||||
@ -35,22 +35,20 @@ component("dbus") {
|
||||
"util.h",
|
||||
]
|
||||
|
||||
defines = [
|
||||
"DBUS_IMPLEMENTATION",
|
||||
]
|
||||
defines = [ "DBUS_IMPLEMENTATION" ]
|
||||
|
||||
deps = [
|
||||
"//base",
|
||||
"//third_party/protobuf:protobuf_lite",
|
||||
]
|
||||
|
||||
public_configs = [
|
||||
"//build/config/linux:dbus",
|
||||
]
|
||||
public_configs = [ "//build/config/linux:dbus" ]
|
||||
}
|
||||
|
||||
proto_library("test_proto") {
|
||||
sources = [ "test_proto.proto" ]
|
||||
sources = [
|
||||
"test_proto.proto",
|
||||
]
|
||||
}
|
||||
|
||||
# This target contains mocks that can be used to write unit tests without
|
||||
@ -73,9 +71,7 @@ source_set("test_support") {
|
||||
"//testing/gmock",
|
||||
]
|
||||
|
||||
configs += [
|
||||
"//build/config/linux:dbus",
|
||||
]
|
||||
configs += [ "//build/config/linux:dbus" ]
|
||||
}
|
||||
|
||||
test("dbus_unittests") {
|
||||
@ -108,9 +104,7 @@ test("dbus_unittests") {
|
||||
"//third_party/protobuf:protobuf_lite",
|
||||
]
|
||||
|
||||
configs += [
|
||||
"//build/config/linux:dbus",
|
||||
]
|
||||
configs += [ "//build/config/linux:dbus" ]
|
||||
}
|
||||
|
||||
executable("dbus_test_server") {
|
||||
@ -127,7 +121,5 @@ executable("dbus_test_server") {
|
||||
"//base/test:test_support",
|
||||
]
|
||||
|
||||
configs += [
|
||||
"//build/config/linux:dbus",
|
||||
]
|
||||
configs += [ "//build/config/linux:dbus" ]
|
||||
}
|
||||
|
||||
@ -25,9 +25,7 @@ component("battery") {
|
||||
"battery_status_service.h",
|
||||
]
|
||||
|
||||
defines = [
|
||||
"DEVICE_BATTERY_IMPLEMENTATION",
|
||||
]
|
||||
defines = [ "DEVICE_BATTERY_IMPLEMENTATION" ]
|
||||
|
||||
deps = [
|
||||
":mojo_bindings",
|
||||
@ -39,25 +37,17 @@ component("battery") {
|
||||
]
|
||||
|
||||
if (is_android) {
|
||||
deps += [
|
||||
"//device/battery/android:battery_jni_headers",
|
||||
]
|
||||
deps += [ "//device/battery/android:battery_jni_headers" ]
|
||||
sources += [
|
||||
"android/battery_jni_registrar.h",
|
||||
"android/battery_jni_registrar.cc",
|
||||
]
|
||||
sources -= [
|
||||
"battery_status_manager_default.cc",
|
||||
]
|
||||
sources -= [ "battery_status_manager_default.cc" ]
|
||||
}
|
||||
|
||||
if (is_chromeos) {
|
||||
configs += [
|
||||
"//build/config/linux:dbus",
|
||||
]
|
||||
deps += [
|
||||
"//chromeos:power_manager_proto",
|
||||
]
|
||||
configs += [ "//build/config/linux:dbus" ]
|
||||
deps += [ "//chromeos:power_manager_proto" ]
|
||||
sources -= [
|
||||
"battery_status_manager_default.cc",
|
||||
"battery_status_manager_linux.cc",
|
||||
@ -66,32 +56,20 @@ component("battery") {
|
||||
|
||||
if (is_desktop_linux) {
|
||||
if (use_dbus) {
|
||||
configs += [
|
||||
"//build/config/linux:dbus",
|
||||
]
|
||||
deps += [
|
||||
"//dbus"
|
||||
]
|
||||
sources -= [
|
||||
"battery_status_manager_default.cc",
|
||||
]
|
||||
configs += [ "//build/config/linux:dbus" ]
|
||||
deps += [ "//dbus" ]
|
||||
sources -= [ "battery_status_manager_default.cc" ]
|
||||
} else {
|
||||
sources -= [
|
||||
"battery_status_manager_linux.cc",
|
||||
]
|
||||
sources -= [ "battery_status_manager_linux.cc" ]
|
||||
}
|
||||
}
|
||||
|
||||
if (is_mac) {
|
||||
sources -= [
|
||||
"battery_status_manager_default.cc",
|
||||
]
|
||||
sources -= [ "battery_status_manager_default.cc" ]
|
||||
}
|
||||
|
||||
if (is_win) {
|
||||
sources -= [
|
||||
"battery_status_manager_default.cc",
|
||||
]
|
||||
sources -= [ "battery_status_manager_default.cc" ]
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -44,8 +44,6 @@ source_set("hid") {
|
||||
]
|
||||
|
||||
if (is_linux) {
|
||||
deps += [
|
||||
"//device/udev_linux",
|
||||
]
|
||||
deps += [ "//device/udev_linux" ]
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,13 +6,17 @@ import("//third_party/protobuf/proto_library.gni")
|
||||
|
||||
# GYP version: device/media_transfer_protocol/media_transfer_protocol.gyp:mtp_file_entry_proto
|
||||
proto_library("mtp_file_entry_proto") {
|
||||
sources = [ "//third_party/cros_system_api/dbus/mtp_file_entry.proto" ]
|
||||
sources = [
|
||||
"//third_party/cros_system_api/dbus/mtp_file_entry.proto",
|
||||
]
|
||||
proto_out_dir = "device/media_transfer_protocol"
|
||||
}
|
||||
|
||||
# GYP version: device/media_transfer_protocol/media_transfer_protocol.gyp:mtp_storage_info_proto
|
||||
proto_library("mtp_storage_info_proto") {
|
||||
sources = [ "//third_party/cros_system_api/dbus/mtp_storage_info.proto" ]
|
||||
sources = [
|
||||
"//third_party/cros_system_api/dbus/mtp_storage_info.proto",
|
||||
]
|
||||
proto_out_dir = "device/media_transfer_protocol"
|
||||
}
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@ static_library("nfc") {
|
||||
"nfc_tag_technology.cc",
|
||||
"nfc_tag_technology.h",
|
||||
"nfc_tag_technology_chromeos.cc",
|
||||
"nfc_tag_technology_chromeos.h"
|
||||
"nfc_tag_technology_chromeos.h",
|
||||
]
|
||||
|
||||
deps = [
|
||||
|
||||
@ -45,11 +45,17 @@ source_set("usb") {
|
||||
|
||||
action("usb_device_ids") {
|
||||
script = "//device/usb/tools/usb_ids.py"
|
||||
inputs = [ source_ids ]
|
||||
outputs = [ generated_ids ]
|
||||
inputs = [
|
||||
source_ids,
|
||||
]
|
||||
outputs = [
|
||||
generated_ids,
|
||||
]
|
||||
args = [
|
||||
"-i", rebase_path(source_ids, root_build_dir),
|
||||
"-o", rebase_path(generated_ids, root_build_dir),
|
||||
"-i",
|
||||
rebase_path(source_ids, root_build_dir),
|
||||
"-o",
|
||||
rebase_path(generated_ids, root_build_dir),
|
||||
]
|
||||
|
||||
# Only the device_usb target can depend on us.
|
||||
|
||||
@ -52,11 +52,12 @@ declare_args() {
|
||||
|
||||
if (use_official_google_api_keys == "") {
|
||||
# Default behavior, check if the key file exists.
|
||||
check_internal_result = exec_script(
|
||||
"build/check_internal.py",
|
||||
[ rebase_path("internal/google_chrome_api_keys.h", root_build_dir) ],
|
||||
"value")
|
||||
use_official_google_api_keys = (check_internal_result == 1)
|
||||
check_internal_result =
|
||||
exec_script("build/check_internal.py",
|
||||
[ rebase_path("internal/google_chrome_api_keys.h",
|
||||
root_build_dir) ],
|
||||
"value")
|
||||
use_official_google_api_keys = check_internal_result == 1
|
||||
}
|
||||
|
||||
config("key_defines") {
|
||||
|
||||
@ -94,9 +94,7 @@ test("gl_tests") {
|
||||
"command_buffer/tests/occlusion_query_unittest.cc",
|
||||
]
|
||||
|
||||
defines = [
|
||||
"GL_GLEXT_PROTOTYPES",
|
||||
]
|
||||
defines = [ "GL_GLEXT_PROTOTYPES" ]
|
||||
|
||||
deps = [
|
||||
":gpu",
|
||||
@ -119,11 +117,10 @@ test("gl_tests") {
|
||||
libs = []
|
||||
|
||||
if (is_android) {
|
||||
deps += [
|
||||
"//testing/android:native_test_native_code",
|
||||
]
|
||||
deps += [ "//testing/android:native_test_native_code" ]
|
||||
libs += [ "android" ]
|
||||
}
|
||||
|
||||
# TODO(GYP)
|
||||
# ['OS == "win"', {
|
||||
# 'dependencies': [
|
||||
|
||||
@ -33,14 +33,21 @@ source_set("client") {
|
||||
|
||||
group("gles2_cmd_helper") {
|
||||
if (is_component_build) {
|
||||
deps = [ "//gpu" ]
|
||||
deps = [
|
||||
"//gpu",
|
||||
]
|
||||
} else {
|
||||
deps = [ ":gles2_cmd_helper_sources" ]
|
||||
deps = [
|
||||
":gles2_cmd_helper_sources",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
source_set("gles2_cmd_helper_sources") {
|
||||
visibility = [ ":gles2_cmd_helper", "//gpu" ]
|
||||
visibility = [
|
||||
":gles2_cmd_helper",
|
||||
"//gpu",
|
||||
]
|
||||
sources = [
|
||||
"gles2_cmd_helper.cc",
|
||||
"gles2_cmd_helper.h",
|
||||
@ -54,7 +61,9 @@ source_set("gles2_cmd_helper_sources") {
|
||||
cflags = [ "/wd4267" ] # size_t to int truncation.
|
||||
}
|
||||
|
||||
deps = [ ":client" ]
|
||||
deps = [
|
||||
":client",
|
||||
]
|
||||
}
|
||||
|
||||
gles2_c_lib_source_files = [
|
||||
@ -97,7 +106,9 @@ gles2_implementation_source_files = [
|
||||
# in. Useful when a target uses the interface, but permits its users to choose
|
||||
# an implementation.
|
||||
source_set("gles2_interface") {
|
||||
sources = [ "gles2_interface.h" ]
|
||||
sources = [
|
||||
"gles2_interface.h",
|
||||
]
|
||||
public_configs = [ "//third_party/khronos:khronos_headers" ]
|
||||
deps = [
|
||||
"//base",
|
||||
@ -173,4 +184,3 @@ component("gles2_c_lib") {
|
||||
"//gpu/command_buffer/common",
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@ -121,9 +121,7 @@ source_set("service") {
|
||||
|
||||
defines = [ "GPU_IMPLEMENTATION" ]
|
||||
|
||||
configs += [
|
||||
"//third_party/khronos:khronos_headers",
|
||||
]
|
||||
configs += [ "//third_party/khronos:khronos_headers" ]
|
||||
|
||||
# Prefer mesa GL headers to system headers, which cause problems on Win.
|
||||
include_dirs = [ "//third_party/mesa/src/include" ]
|
||||
@ -164,5 +162,7 @@ source_set("service") {
|
||||
}
|
||||
|
||||
proto_library("disk_cache_proto") {
|
||||
sources = [ "disk_cache_proto.proto" ]
|
||||
sources = [
|
||||
"disk_cache_proto.proto",
|
||||
]
|
||||
}
|
||||
|
||||
@ -58,7 +58,10 @@ source_set("config") {
|
||||
|
||||
if (is_win) {
|
||||
deps += [ "//third_party/libxml" ]
|
||||
libs = [ "dxguid.lib", "setupapi.lib" ]
|
||||
libs = [
|
||||
"dxguid.lib",
|
||||
"setupapi.lib",
|
||||
]
|
||||
|
||||
if (is_chrome_branded && is_official_build) {
|
||||
sources += [
|
||||
@ -74,18 +77,14 @@ source_set("config") {
|
||||
defines += [ "USE_LIBPCI=1" ]
|
||||
}
|
||||
if (is_linux && use_libpci && (use_x11 || use_ozone)) {
|
||||
deps += [
|
||||
"//build/config/linux:libpci",
|
||||
]
|
||||
deps += [ "//build/config/linux:libpci" ]
|
||||
}
|
||||
if (is_linux && use_x11) {
|
||||
configs += [
|
||||
"//build/config/linux:x11",
|
||||
"//build/config/linux:xext",
|
||||
]
|
||||
deps += [
|
||||
"//third_party/libXNVCtrl",
|
||||
]
|
||||
deps += [ "//third_party/libXNVCtrl" ]
|
||||
} else {
|
||||
sources -= [ "gpu_info_collector_x11.cc" ]
|
||||
}
|
||||
@ -93,4 +92,3 @@ source_set("config") {
|
||||
sources -= [ "gpu_info_collector_ozone.cc" ]
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -69,15 +69,14 @@ component("ipc") {
|
||||
}
|
||||
|
||||
if (is_win || is_ios) {
|
||||
sources -= [
|
||||
"unix_domain_socket_util.cc",
|
||||
]
|
||||
sources -= [ "unix_domain_socket_util.cc" ]
|
||||
}
|
||||
|
||||
defines = [ "IPC_IMPLEMENTATION" ]
|
||||
|
||||
deps = [
|
||||
"//base",
|
||||
|
||||
# TODO(viettrungluu): Needed for base/lazy_instance.h, which is suspect.
|
||||
"//base/third_party/dynamic_annotations",
|
||||
]
|
||||
@ -177,4 +176,3 @@ static_library("test_support") {
|
||||
"//testing/gtest",
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@ -75,9 +75,7 @@ if (enable_webrtc || !is_android) {
|
||||
"notifier/listener/xmpp_push_client.cc",
|
||||
"notifier/listener/xmpp_push_client.h",
|
||||
]
|
||||
defines = [
|
||||
"_CRT_SECURE_NO_WARNINGS",
|
||||
]
|
||||
defines = [ "_CRT_SECURE_NO_WARNINGS" ]
|
||||
|
||||
public_deps = [
|
||||
"//third_party/libjingle",
|
||||
@ -170,9 +168,11 @@ if (enable_webrtc || !is_android) {
|
||||
} else {
|
||||
# !enable_webrtc and is_android
|
||||
# Stub targets as Android doesn't use libjingle when webrtc is disabled.
|
||||
source_set("jingle_glue") { }
|
||||
source_set("jingle_glue") {
|
||||
}
|
||||
|
||||
source_set("jingle_glue_test_util") { }
|
||||
source_set("jingle_glue_test_util") {
|
||||
}
|
||||
|
||||
# GYP version: jingle/jingle.gyp:notifier
|
||||
static_library("notifier") {
|
||||
@ -186,9 +186,10 @@ if (enable_webrtc || !is_android) {
|
||||
]
|
||||
deps = [
|
||||
"//base",
|
||||
"//net"
|
||||
"//net",
|
||||
]
|
||||
}
|
||||
|
||||
source_set("notifier_test_util") { }
|
||||
source_set("notifier_test_util") {
|
||||
}
|
||||
}
|
||||
|
||||
122
media/BUILD.gn
122
media/BUILD.gn
@ -49,16 +49,21 @@ if (use_ozone) {
|
||||
script = "../ui/ozone/generate_constructor_list.py"
|
||||
|
||||
platform_list_txt_file = "$target_gen_dir/../ui/ozone/platform_list.txt"
|
||||
constructor_list_cc_file = "$target_gen_dir/../media/ozone/constructor_list.cc"
|
||||
constructor_list_cc_file =
|
||||
"$target_gen_dir/../media/ozone/constructor_list.cc"
|
||||
|
||||
sources = [ platform_list_txt_file ]
|
||||
outputs = [ constructor_list_cc_file ]
|
||||
sources = [
|
||||
platform_list_txt_file,
|
||||
]
|
||||
outputs = [
|
||||
constructor_list_cc_file,
|
||||
]
|
||||
args = [
|
||||
"--platform_list=" + rebase_path(platform_list_txt_file, root_build_dir),
|
||||
"--output_cc=" + rebase_path(constructor_list_cc_file, root_build_dir),
|
||||
"--namespace=media",
|
||||
"--typename=MediaOzonePlatform",
|
||||
"--include=\"media/ozone/media_ozone_platform.h\""
|
||||
"--include=\"media/ozone/media_ozone_platform.h\"",
|
||||
]
|
||||
}
|
||||
}
|
||||
@ -238,7 +243,7 @@ component("media") {
|
||||
"formats/webm/webm_webvtt_parser.h",
|
||||
]
|
||||
|
||||
configs += [ ":media_config", ]
|
||||
configs += [ ":media_config" ]
|
||||
all_dependent_configs = [ ":media_dependent_config" ]
|
||||
|
||||
cflags = []
|
||||
@ -283,11 +288,11 @@ component("media") {
|
||||
}
|
||||
|
||||
if (media_use_libvpx) {
|
||||
sources += [
|
||||
"filters/vpx_video_decoder.cc",
|
||||
"filters/vpx_video_decoder.h",
|
||||
]
|
||||
deps += [ "//third_party/libvpx" ]
|
||||
sources += [
|
||||
"filters/vpx_video_decoder.cc",
|
||||
"filters/vpx_video_decoder.h",
|
||||
]
|
||||
deps += [ "//third_party/libvpx" ]
|
||||
}
|
||||
|
||||
if (!is_android) {
|
||||
@ -340,9 +345,9 @@ component("media") {
|
||||
include_dirs += [ target_gen_dir ]
|
||||
|
||||
sources += [
|
||||
"ozone/media_ozone_platform.cc",
|
||||
"ozone/media_ozone_platform.h",
|
||||
] + get_target_outputs(":generate_ozone_constructor_list")
|
||||
"ozone/media_ozone_platform.cc",
|
||||
"ozone/media_ozone_platform.h",
|
||||
] + get_target_outputs(":generate_ozone_constructor_list")
|
||||
|
||||
deps += [
|
||||
":generate_ozone_constructor_list",
|
||||
@ -364,9 +369,7 @@ component("media") {
|
||||
}
|
||||
|
||||
if (is_ios) {
|
||||
deps += [
|
||||
"//media/base/mac",
|
||||
]
|
||||
deps += [ "//media/base/mac" ]
|
||||
}
|
||||
|
||||
if (is_win) {
|
||||
@ -376,10 +379,8 @@ component("media") {
|
||||
"mfreadwrite.lib",
|
||||
"mfuuid.lib",
|
||||
]
|
||||
cflags += [
|
||||
"/wd4267" # TODO(wolenetz): Fix size_t to int trunctaion in win64. See
|
||||
# http://crbug.com/171009
|
||||
]
|
||||
cflags += [ "/wd4267" ] # TODO(wolenetz): Fix size_t to int trunctaion in win64. See
|
||||
# http://crbug.com/171009
|
||||
}
|
||||
|
||||
if (proprietary_codecs) {
|
||||
@ -606,35 +607,28 @@ test("media_unittests") {
|
||||
}
|
||||
|
||||
if (is_win && cpu_arch == "x64") {
|
||||
cflags += [
|
||||
"/wd4267" # TODO(wolenetz): Fix size_t to int trunctaion in win64. See
|
||||
# http://crbug.com/171009
|
||||
]
|
||||
cflags += [ "/wd4267" ] # TODO(wolenetz): Fix size_t to int trunctaion in win64. See
|
||||
# http://crbug.com/171009
|
||||
}
|
||||
|
||||
if (is_mac || is_ios) {
|
||||
deps += [
|
||||
"//media/base/mac",
|
||||
]
|
||||
deps += [ "//media/base/mac" ]
|
||||
}
|
||||
|
||||
if (is_mac) {
|
||||
sources += [
|
||||
"video/capture/mac/video_capture_device_factory_mac_unittest.mm"
|
||||
]
|
||||
sources +=
|
||||
[ "video/capture/mac/video_capture_device_factory_mac_unittest.mm" ]
|
||||
}
|
||||
|
||||
# include_dirs += [
|
||||
# # Needed by media_drm_bridge.cc.
|
||||
# target_gen_dir,
|
||||
# ],
|
||||
# include_dirs += [
|
||||
# # Needed by media_drm_bridge.cc.
|
||||
# target_gen_dir,
|
||||
# ],
|
||||
|
||||
configs += [ ":media_config" ]
|
||||
|
||||
if (media_use_ffmpeg) {
|
||||
deps += [
|
||||
"//third_party/ffmpeg", # Direct dependency required to inherit config.
|
||||
]
|
||||
deps += [ "//third_party/ffmpeg" ] # Direct dependency required to inherit config.
|
||||
}
|
||||
}
|
||||
|
||||
@ -665,9 +659,7 @@ test("media_perftests") {
|
||||
deps += [ "//ui/gl" ]
|
||||
}
|
||||
if (media_use_ffmpeg) {
|
||||
deps += [
|
||||
"//third_party/ffmpeg", # Direct dependency required to inherit config.
|
||||
]
|
||||
deps += [ "//third_party/ffmpeg" ] # Direct dependency required to inherit config.
|
||||
}
|
||||
}
|
||||
|
||||
@ -709,22 +701,26 @@ component("shared_memory_support") {
|
||||
]
|
||||
configs += [ ":media_config" ]
|
||||
defines = [ "MEDIA_IMPLEMENTATION" ]
|
||||
deps = [ "//base" ]
|
||||
deps = [
|
||||
"//base",
|
||||
]
|
||||
}
|
||||
|
||||
if (media_use_ffmpeg) {
|
||||
test("ffmpeg_unittests") {
|
||||
sources = [ "ffmpeg/ffmpeg_unittest.cc" ]
|
||||
sources = [
|
||||
"ffmpeg/ffmpeg_unittest.cc",
|
||||
]
|
||||
|
||||
deps = [
|
||||
":media",
|
||||
":test_support",
|
||||
"//base",
|
||||
"//base:i18n",
|
||||
"//base/test:test_support",
|
||||
"//testing/gtest",
|
||||
"//third_party/ffmpeg",
|
||||
"//ui/gfx:test_support",
|
||||
":media",
|
||||
":test_support",
|
||||
"//base",
|
||||
"//base:i18n",
|
||||
"//base/test:test_support",
|
||||
"//testing/gtest",
|
||||
"//third_party/ffmpeg",
|
||||
"//ui/gfx:test_support",
|
||||
]
|
||||
}
|
||||
|
||||
@ -747,16 +743,17 @@ if (media_use_ffmpeg) {
|
||||
"//ui/gfx/geometry",
|
||||
"//ui/gfx:test_support",
|
||||
]
|
||||
# TODO(ajwong): This was in the original gyp, but it seems silly.
|
||||
# ['os_posix==1 and OS!="mac"', {
|
||||
# 'conditions': [
|
||||
# ['use_allocator!="none"', {
|
||||
# 'dependencies': [
|
||||
# '../base/allocator/allocator.gyp:allocator',
|
||||
# ],
|
||||
# }],
|
||||
# ],
|
||||
# }],
|
||||
|
||||
# TODO(ajwong): This was in the original gyp, but it seems silly.
|
||||
# ['os_posix==1 and OS!="mac"', {
|
||||
# 'conditions': [
|
||||
# ['use_allocator!="none"', {
|
||||
# 'dependencies': [
|
||||
# '../base/allocator/allocator.gyp:allocator',
|
||||
# ],
|
||||
# }],
|
||||
# ],
|
||||
# }],
|
||||
}
|
||||
}
|
||||
|
||||
@ -775,8 +772,9 @@ if (use_x11) {
|
||||
":media_config",
|
||||
"//build/config/linux:x11",
|
||||
"//build/config/linux:xext",
|
||||
# TODO(ajwong): Why does xext get a separate thing in //build/config/linux:BUILD.gn
|
||||
# "//build/config/linux:xrender",
|
||||
|
||||
# TODO(ajwong): Why does xext get a separate thing in //build/config/linux:BUILD.gn
|
||||
# "//build/config/linux:xrender",
|
||||
]
|
||||
deps = [
|
||||
":media",
|
||||
|
||||
@ -12,8 +12,12 @@ if (!link_pulseaudio) {
|
||||
extra_header = "pulse/pulse_stub_header.fragment"
|
||||
|
||||
script = "../../tools/generate_stubs/generate_stubs.py"
|
||||
sources = [ "pulse/pulse.sigs" ]
|
||||
inputs = [ extra_header ]
|
||||
sources = [
|
||||
"pulse/pulse.sigs",
|
||||
]
|
||||
inputs = [
|
||||
extra_header,
|
||||
]
|
||||
stubs_filename_root = "pulse_stubs"
|
||||
|
||||
# TODO(ajwong): these need to be included in the pulse build.
|
||||
@ -22,12 +26,18 @@ if (!link_pulseaudio) {
|
||||
"$target_gen_dir/pulse/$stubs_filename_root.h",
|
||||
]
|
||||
args = [
|
||||
"-i", rebase_path("$target_gen_dir/pulse", root_build_dir),
|
||||
"-o", rebase_path("$target_gen_dir/pulse", root_build_dir),
|
||||
"-t", "posix_stubs",
|
||||
"-e", rebase_path(extra_header, root_build_dir),
|
||||
"-s", stubs_filename_root,
|
||||
"-p", "media/audio/pulse",
|
||||
"-i",
|
||||
rebase_path("$target_gen_dir/pulse", root_build_dir),
|
||||
"-o",
|
||||
rebase_path("$target_gen_dir/pulse", root_build_dir),
|
||||
"-t",
|
||||
"posix_stubs",
|
||||
"-e",
|
||||
rebase_path(extra_header, root_build_dir),
|
||||
"-s",
|
||||
stubs_filename_root,
|
||||
"-p",
|
||||
"media/audio/pulse",
|
||||
]
|
||||
|
||||
args += rebase_path(sources, root_build_dir)
|
||||
@ -160,9 +170,7 @@ source_set("audio") {
|
||||
"android/opensles_output.h",
|
||||
"android/opensles_wrapper.cc",
|
||||
]
|
||||
deps += [
|
||||
"//media/base/android:media_jni_headers",
|
||||
]
|
||||
deps += [ "//media/base/android:media_jni_headers" ]
|
||||
}
|
||||
|
||||
if (is_openbsd) {
|
||||
@ -173,9 +181,7 @@ source_set("audio") {
|
||||
}
|
||||
|
||||
if (is_linux) {
|
||||
sources += [
|
||||
"linux/audio_manager_linux.cc",
|
||||
]
|
||||
sources += [ "linux/audio_manager_linux.cc" ]
|
||||
}
|
||||
|
||||
if (use_alsa) {
|
||||
@ -249,7 +255,9 @@ source_set("test_support") {
|
||||
"test_audio_input_controller_factory.cc",
|
||||
"test_audio_input_controller_factory.h",
|
||||
]
|
||||
deps = [ "//testing/gmock" ]
|
||||
deps = [
|
||||
"//testing/gmock",
|
||||
]
|
||||
configs += [ "//media:media_config" ]
|
||||
}
|
||||
|
||||
@ -278,13 +286,9 @@ source_set("unittests") {
|
||||
configs += [ "//media:media_config" ]
|
||||
|
||||
if (is_android) {
|
||||
sources += [
|
||||
"android/audio_android_unittest.cc",
|
||||
]
|
||||
sources += [ "android/audio_android_unittest.cc" ]
|
||||
} else {
|
||||
sources += [
|
||||
"audio_input_volume_unittest.cc",
|
||||
]
|
||||
sources += [ "audio_input_volume_unittest.cc" ]
|
||||
}
|
||||
|
||||
if (is_mac) {
|
||||
@ -323,8 +327,6 @@ source_set("unittests") {
|
||||
}
|
||||
|
||||
if (use_alsa) {
|
||||
sources += [
|
||||
"alsa/alsa_output_unittest.cc",
|
||||
]
|
||||
sources += [ "alsa/alsa_output_unittest.cc" ]
|
||||
}
|
||||
}
|
||||
|
||||
@ -174,7 +174,9 @@ source_set("base") {
|
||||
"yuv_convert.h",
|
||||
]
|
||||
defines = []
|
||||
deps = [ "//skia" ]
|
||||
deps = [
|
||||
"//skia",
|
||||
]
|
||||
libs = []
|
||||
configs += [ "//media:media_config" ]
|
||||
|
||||
@ -210,10 +212,11 @@ source_set("base") {
|
||||
configs += [
|
||||
"//build/config/linux:x11",
|
||||
"//build/config/linux:xext",
|
||||
# TODO(ajwong): Why does xent get a separate thing in //build/config/linux:BUILD.gn
|
||||
# "//build/config/linux:xdamage",
|
||||
# "//build/config/linux:xfixes",
|
||||
# "//build/config/linux:xtst",
|
||||
|
||||
# TODO(ajwong): Why does xent get a separate thing in //build/config/linux:BUILD.gn
|
||||
# "//build/config/linux:xdamage",
|
||||
# "//build/config/linux:xfixes",
|
||||
# "//build/config/linux:xtst",
|
||||
]
|
||||
sources += [ "user_input_monitor_linux.cc" ]
|
||||
deps += [
|
||||
@ -280,7 +283,9 @@ source_set("test_support") {
|
||||
"test_helpers.h",
|
||||
]
|
||||
configs += [ "//media:media_config" ]
|
||||
deps = [ "//testing/gmock" ]
|
||||
deps = [
|
||||
"//testing/gmock",
|
||||
]
|
||||
}
|
||||
|
||||
source_set("unittests") {
|
||||
@ -350,9 +355,7 @@ source_set("unittests") {
|
||||
}
|
||||
|
||||
if (!is_android) {
|
||||
sources += [
|
||||
"container_names_unittest.cc",
|
||||
]
|
||||
sources += [ "container_names_unittest.cc" ]
|
||||
} else {
|
||||
deps += [ "//ui/gl" ]
|
||||
}
|
||||
@ -381,13 +384,11 @@ source_set("perftests") {
|
||||
]
|
||||
|
||||
if (media_use_ffmpeg) {
|
||||
sources += [
|
||||
"demuxer_perftest.cc",
|
||||
]
|
||||
sources += [ "demuxer_perftest.cc" ]
|
||||
}
|
||||
|
||||
if (is_android) {
|
||||
deps += [ "//ui/gl"]
|
||||
deps += [ "//ui/gl" ]
|
||||
}
|
||||
}
|
||||
|
||||
@ -421,9 +422,11 @@ if (cpu_arch == "x86" || cpu_arch == "x64") {
|
||||
yasm_flags = [
|
||||
"-DCHROMIUM",
|
||||
"-DEXPORT_SYMBOLS",
|
||||
|
||||
# In addition to the same path as source asm, let yasm %include
|
||||
# search path be relative to src/ per Chromium policy.
|
||||
"-I", rebase_path("..", root_build_dir),
|
||||
"-I",
|
||||
rebase_path("..", root_build_dir),
|
||||
]
|
||||
|
||||
inputs = [
|
||||
@ -455,7 +458,7 @@ if (cpu_arch == "x86" || cpu_arch == "x64") {
|
||||
if (is_posix) {
|
||||
yasm_flags += [ "-DELF" ]
|
||||
if (cpu_arch == "x64") {
|
||||
# TODO(ajwong): Why isn't this true in mac?
|
||||
# TODO(ajwong): Why isn't this true in mac?
|
||||
yasm_flags += [ "-DPIC" ]
|
||||
}
|
||||
}
|
||||
|
||||
@ -109,9 +109,7 @@ android_library("media_java") {
|
||||
"//base:base_java",
|
||||
]
|
||||
|
||||
srcjar_deps = [
|
||||
":media_java_enums_srcjar",
|
||||
]
|
||||
srcjar_deps = [ ":media_java_enums_srcjar" ]
|
||||
|
||||
DEPRECATED_java_in_dir = "java/src"
|
||||
}
|
||||
|
||||
@ -203,9 +203,9 @@ source_set("receiver") {
|
||||
source_set("test_support") {
|
||||
testonly = true
|
||||
sources = [
|
||||
# TODO(hclam): FFmpeg.
|
||||
# "test/fake_media_source.cc",
|
||||
# "test/fake_media_source.h",
|
||||
# TODO(hclam): FFmpeg.
|
||||
# "test/fake_media_source.cc",
|
||||
# "test/fake_media_source.h",
|
||||
"test/fake_single_thread_task_runner.cc",
|
||||
"test/fake_single_thread_task_runner.h",
|
||||
"test/skewed_single_thread_task_runner.cc",
|
||||
@ -239,8 +239,9 @@ source_set("test_support") {
|
||||
":receiver",
|
||||
"//base/test:test_support",
|
||||
"//testing/gtest",
|
||||
# TODO(hclam): Does not build on ARM yet.
|
||||
# "//third_party/ffmpeg",
|
||||
|
||||
# TODO(hclam): Does not build on ARM yet.
|
||||
# "//third_party/ffmpeg",
|
||||
"//third_party/libyuv",
|
||||
"//third_party/mt19937ar",
|
||||
"//ui/gfx",
|
||||
@ -265,7 +266,8 @@ test("cast_unittests") {
|
||||
"net/rtcp/rtcp_unittest.cc",
|
||||
"net/rtcp/rtcp_utility_unittest.cc",
|
||||
"net/rtcp/receiver_rtcp_event_subscriber_unittest.cc",
|
||||
# TODO(miu): The following two are test utility modules. Rename/move the files.
|
||||
|
||||
# TODO(miu): The following two are test utility modules. Rename/move the files.
|
||||
"net/rtcp/test_rtcp_packet_builder.cc",
|
||||
"net/rtcp/test_rtcp_packet_builder.h",
|
||||
"net/rtp/cast_message_builder_unittest.cc",
|
||||
|
||||
@ -9,9 +9,7 @@ source_set("proto") {
|
||||
public_deps = [
|
||||
":cast_network_simulation_proto",
|
||||
]
|
||||
public_configs = [
|
||||
"//third_party/protobuf:protobuf_config"
|
||||
]
|
||||
public_configs = [ "//third_party/protobuf:protobuf_config" ]
|
||||
}
|
||||
|
||||
proto_library("cast_network_simulation_proto") {
|
||||
@ -20,4 +18,3 @@ proto_library("cast_network_simulation_proto") {
|
||||
"network_simulation_model.proto",
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@ -54,6 +54,7 @@ group("clearkeycdmadapter") {
|
||||
deps = [
|
||||
#":cdmadapter", TODO(GYP)
|
||||
":clearkeycdm",
|
||||
|
||||
#":clearkeycdmadapter_resources", TODO(GYP)
|
||||
"//ppapi:ppapi_cpp",
|
||||
]
|
||||
|
||||
@ -12,6 +12,6 @@ group("mojo") {
|
||||
group("tests") {
|
||||
testonly = true
|
||||
deps = [
|
||||
"//media/mojo/services:tests"
|
||||
]
|
||||
"//media/mojo/services:tests",
|
||||
]
|
||||
}
|
||||
|
||||
@ -90,7 +90,7 @@ test("mojo_media_lib_unittests") {
|
||||
"//mojo/edk/test:run_all_unittests",
|
||||
"//mojo/environment:chromium",
|
||||
"//testing/gtest",
|
||||
":lib"
|
||||
":lib",
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
651
net/BUILD.gn
651
net/BUILD.gn
@ -22,11 +22,10 @@ if (is_android) {
|
||||
}
|
||||
|
||||
# The list of net files is kept in net.gypi. Read it.
|
||||
gypi_values = exec_script(
|
||||
"//build/gypi_to_gn.py",
|
||||
[ rebase_path("net.gypi") ],
|
||||
"scope",
|
||||
[ "net.gypi" ])
|
||||
gypi_values = exec_script("//build/gypi_to_gn.py",
|
||||
[ rebase_path("net.gypi") ],
|
||||
"scope",
|
||||
[ "net.gypi" ])
|
||||
|
||||
# Disable Kerberos on ChromeOS, Android and iOS, at least for now. It needs
|
||||
# configuration (krb5.conf and so on).
|
||||
@ -70,8 +69,7 @@ config("net_win_size_truncation") {
|
||||
|
||||
component("net") {
|
||||
sources =
|
||||
gypi_values.net_nacl_common_sources +
|
||||
gypi_values.net_non_nacl_sources
|
||||
gypi_values.net_nacl_common_sources + gypi_values.net_non_nacl_sources
|
||||
|
||||
cflags = []
|
||||
defines = [
|
||||
@ -81,7 +79,7 @@ component("net") {
|
||||
# doesn't seem to be set in the regular builds, so we're skipping this
|
||||
# capability here.
|
||||
"DLOPEN_KERBEROS",
|
||||
"NET_IMPLEMENTATION"
|
||||
"NET_IMPLEMENTATION",
|
||||
]
|
||||
configs += [ ":net_win_size_truncation" ]
|
||||
public_configs = [ ":net_config" ]
|
||||
@ -89,10 +87,10 @@ component("net") {
|
||||
|
||||
public_deps = [
|
||||
"//crypto",
|
||||
"//crypto:platform"
|
||||
"//crypto:platform",
|
||||
]
|
||||
deps = [
|
||||
":net_resources",
|
||||
":net_resources",
|
||||
"//base",
|
||||
"//base:i18n",
|
||||
"//base:prefs",
|
||||
@ -250,9 +248,7 @@ component("net") {
|
||||
]
|
||||
}
|
||||
if (is_win) {
|
||||
sources -= [
|
||||
"cert/sha256_legacy_support_nss_win.cc",
|
||||
]
|
||||
sources -= [ "cert/sha256_legacy_support_nss_win.cc" ]
|
||||
}
|
||||
} else {
|
||||
sources -= [
|
||||
@ -283,9 +279,7 @@ component("net") {
|
||||
"ssl/openssl_ssl_util.h",
|
||||
]
|
||||
if (is_mac) {
|
||||
sources -= [
|
||||
"ssl/openssl_platform_key_mac.cc",
|
||||
]
|
||||
sources -= [ "ssl/openssl_platform_key_mac.cc" ]
|
||||
}
|
||||
if (is_win) {
|
||||
sources -= [
|
||||
@ -309,9 +303,7 @@ component("net") {
|
||||
"ssl/openssl_client_key_store.h",
|
||||
]
|
||||
if (is_android) {
|
||||
sources -= [
|
||||
"base/openssl_private_key_store_android.cc",
|
||||
]
|
||||
sources -= [ "base/openssl_private_key_store_android.cc" ]
|
||||
}
|
||||
} else if (is_android) {
|
||||
# Android doesn't use these even when using OpenSSL.
|
||||
@ -513,7 +505,7 @@ component("net") {
|
||||
"base/address_tracker_linux.cc",
|
||||
"base/address_tracker_linux.h",
|
||||
"base/net_util_linux.cc",
|
||||
"base/net_util_linux.h"
|
||||
"base/net_util_linux.h",
|
||||
]
|
||||
set_sources_assignment_filter(sources_assignment_filter)
|
||||
|
||||
@ -573,7 +565,7 @@ static_library("http_server") {
|
||||
]
|
||||
configs += [
|
||||
"//build/config/compiler:wexit_time_destructors",
|
||||
":net_win_size_truncation"
|
||||
":net_win_size_truncation",
|
||||
]
|
||||
deps = [
|
||||
":net",
|
||||
@ -705,7 +697,7 @@ source_set("test_support") {
|
||||
]
|
||||
|
||||
if (!use_openssl && (use_nss_certs || is_ios)) {
|
||||
public_deps += ["//crypto:platform" ]
|
||||
public_deps += [ "//crypto:platform" ]
|
||||
}
|
||||
|
||||
if (!is_android) {
|
||||
@ -729,9 +721,7 @@ source_set("test_support") {
|
||||
}
|
||||
|
||||
if (!use_nss_certs) {
|
||||
sources -= [
|
||||
"test/cert_test_util_nss.cc",
|
||||
]
|
||||
sources -= [ "test/cert_test_util_nss.cc" ]
|
||||
}
|
||||
}
|
||||
|
||||
@ -795,7 +785,9 @@ if (use_v8_in_net) {
|
||||
if (!is_ios && !is_android) {
|
||||
executable("crash_cache") {
|
||||
testonly = true
|
||||
sources = [ "tools/crash_cache/crash_cache.cc" ]
|
||||
sources = [
|
||||
"tools/crash_cache/crash_cache.cc",
|
||||
]
|
||||
configs += [ ":net_win_size_truncation" ]
|
||||
deps = [
|
||||
":net",
|
||||
@ -806,7 +798,9 @@ if (!is_ios && !is_android) {
|
||||
|
||||
executable("crl_set_dump") {
|
||||
testonly = true
|
||||
sources = [ "tools/crl_set_dump/crl_set_dump.cc" ]
|
||||
sources = [
|
||||
"tools/crl_set_dump/crl_set_dump.cc",
|
||||
]
|
||||
configs += [ ":net_win_size_truncation" ]
|
||||
deps = [
|
||||
":net",
|
||||
@ -816,7 +810,9 @@ if (!is_ios && !is_android) {
|
||||
|
||||
executable("dns_fuzz_stub") {
|
||||
testonly = true
|
||||
sources = [ "tools/dns_fuzz_stub/dns_fuzz_stub.cc" ]
|
||||
sources = [
|
||||
"tools/dns_fuzz_stub/dns_fuzz_stub.cc",
|
||||
]
|
||||
configs += [ ":net_win_size_truncation" ]
|
||||
deps = [
|
||||
":net",
|
||||
@ -838,7 +834,9 @@ if (!is_ios && !is_android) {
|
||||
|
||||
executable("get_server_time") {
|
||||
testonly = true
|
||||
sources = [ "tools/get_server_time/get_server_time.cc" ]
|
||||
sources = [
|
||||
"tools/get_server_time/get_server_time.cc",
|
||||
]
|
||||
configs += [ ":net_win_size_truncation" ]
|
||||
deps = [
|
||||
":net",
|
||||
@ -851,7 +849,9 @@ if (!is_ios && !is_android) {
|
||||
if (use_v8_in_net) {
|
||||
executable("net_watcher") {
|
||||
testonly = true
|
||||
sources = [ "tools/net_watcher/net_watcher.cc" ]
|
||||
sources = [
|
||||
"tools/net_watcher/net_watcher.cc",
|
||||
]
|
||||
deps = [
|
||||
":net",
|
||||
":net_with_v8",
|
||||
@ -870,7 +870,9 @@ if (!is_ios && !is_android) {
|
||||
|
||||
executable("run_testserver") {
|
||||
testonly = true
|
||||
sources = [ "tools/testserver/run_testserver.cc" ]
|
||||
sources = [
|
||||
"tools/testserver/run_testserver.cc",
|
||||
]
|
||||
deps = [
|
||||
":net", # TODO(brettw) bug 363749: this shouldn't be necessary. It's not
|
||||
# in the GYP build, and can be removed when the bug is fixed.
|
||||
@ -883,7 +885,9 @@ if (!is_ios && !is_android) {
|
||||
|
||||
executable("stress_cache") {
|
||||
testonly = true
|
||||
sources = [ "disk_cache/blockfile/stress_cache.cc" ]
|
||||
sources = [
|
||||
"disk_cache/blockfile/stress_cache.cc",
|
||||
]
|
||||
configs += [ ":net_win_size_truncation" ]
|
||||
deps = [
|
||||
":net",
|
||||
@ -893,7 +897,9 @@ if (!is_ios && !is_android) {
|
||||
}
|
||||
|
||||
executable("tld_cleanup") {
|
||||
sources = [ "tools/tld_cleanup/tld_cleanup.cc" ]
|
||||
sources = [
|
||||
"tools/tld_cleanup/tld_cleanup.cc",
|
||||
]
|
||||
configs += [ ":net_win_size_truncation" ]
|
||||
deps = [
|
||||
"//base",
|
||||
@ -981,7 +987,9 @@ if (is_linux) {
|
||||
|
||||
executable("flip_in_mem_edsm_server") {
|
||||
testonly = true
|
||||
sources = [ "tools/flip_server/flip_in_mem_edsm_server.cc" ]
|
||||
sources = [
|
||||
"tools/flip_server/flip_in_mem_edsm_server.cc",
|
||||
]
|
||||
deps = [
|
||||
":flip_in_mem_edsm_server_base",
|
||||
":net",
|
||||
@ -1035,7 +1043,9 @@ if (is_linux) {
|
||||
}
|
||||
|
||||
executable("quic_client") {
|
||||
sources = [ "tools/quic/quic_client_bin.cc" ]
|
||||
sources = [
|
||||
"tools/quic/quic_client_bin.cc",
|
||||
]
|
||||
deps = [
|
||||
":quic_base",
|
||||
":net",
|
||||
@ -1070,7 +1080,9 @@ if (is_android) {
|
||||
if (is_android || is_linux) {
|
||||
executable("disk_cache_memory_test") {
|
||||
testonly = true
|
||||
sources = [ "tools/disk_cache_memory_test/disk_cache_memory_test.cc" ]
|
||||
sources = [
|
||||
"tools/disk_cache_memory_test/disk_cache_memory_test.cc",
|
||||
]
|
||||
deps = [
|
||||
":net",
|
||||
"//base",
|
||||
@ -1082,308 +1094,305 @@ if (is_android || is_linux) {
|
||||
# TODO(GYP) Also doesn't work on Windows; dependency on boringssl is wrong.
|
||||
# TODO(GYP) Also doesn't work on Mac, need to figure out why not.
|
||||
if (!is_android && !is_win && !is_mac) {
|
||||
|
||||
source_set("quic_tools") {
|
||||
sources = [
|
||||
"quic/quic_dispatcher.cc",
|
||||
"quic/quic_dispatcher.h",
|
||||
"quic/quic_in_memory_cache.cc",
|
||||
"quic/quic_in_memory_cache.h",
|
||||
"quic/quic_per_connection_packet_writer.cc",
|
||||
"quic/quic_per_connection_packet_writer.h",
|
||||
"quic/quic_server.cc",
|
||||
"quic/quic_server.h",
|
||||
"quic/quic_server_packet_writer.cc",
|
||||
"quic/quic_server_packet_writer.h",
|
||||
"quic/quic_server_session.cc",
|
||||
"quic/quic_server_session.h",
|
||||
"quic/quic_spdy_server_stream.cc",
|
||||
"quic/quic_spdy_server_stream.h",
|
||||
"quic/quic_time_wait_list_manager.cc",
|
||||
"quic/quic_time_wait_list_manager.h",
|
||||
]
|
||||
deps = [
|
||||
":net",
|
||||
"//base",
|
||||
"//base/third_party/dynamic_annotations",
|
||||
"//url",
|
||||
]
|
||||
}
|
||||
|
||||
test("net_unittests") {
|
||||
sources = gypi_values.net_test_sources
|
||||
|
||||
configs += [ ":net_win_size_truncation" ]
|
||||
defines = []
|
||||
|
||||
deps = [
|
||||
":extras",
|
||||
":http_server",
|
||||
":net",
|
||||
":quic_tools",
|
||||
":test_support",
|
||||
"//base",
|
||||
"//base:i18n",
|
||||
"//base:prefs_test_support",
|
||||
"//base/allocator",
|
||||
"//base/third_party/dynamic_annotations",
|
||||
"//crypto",
|
||||
"//crypto:platform",
|
||||
"//crypto:test_support",
|
||||
"//net/base/registry_controlled_domains",
|
||||
"//testing/gmock",
|
||||
"//testing/gtest",
|
||||
"//third_party/zlib",
|
||||
"//url",
|
||||
]
|
||||
|
||||
if (is_linux) {
|
||||
sources += gypi_values.net_linux_test_sources
|
||||
deps += [
|
||||
":balsa",
|
||||
":epoll_server",
|
||||
":flip_in_mem_edsm_server_base",
|
||||
":quic_base",
|
||||
source_set("quic_tools") {
|
||||
sources = [
|
||||
"quic/quic_dispatcher.cc",
|
||||
"quic/quic_dispatcher.h",
|
||||
"quic/quic_in_memory_cache.cc",
|
||||
"quic/quic_in_memory_cache.h",
|
||||
"quic/quic_per_connection_packet_writer.cc",
|
||||
"quic/quic_per_connection_packet_writer.h",
|
||||
"quic/quic_server.cc",
|
||||
"quic/quic_server.h",
|
||||
"quic/quic_server_packet_writer.cc",
|
||||
"quic/quic_server_packet_writer.h",
|
||||
"quic/quic_server_session.cc",
|
||||
"quic/quic_server_session.h",
|
||||
"quic/quic_spdy_server_stream.cc",
|
||||
"quic/quic_spdy_server_stream.h",
|
||||
"quic/quic_time_wait_list_manager.cc",
|
||||
"quic/quic_time_wait_list_manager.h",
|
||||
]
|
||||
deps = [
|
||||
":net",
|
||||
"//base",
|
||||
"//base/third_party/dynamic_annotations",
|
||||
"//url",
|
||||
]
|
||||
}
|
||||
|
||||
if (is_mac || is_ios) {
|
||||
sources += gypi_values.net_base_test_mac_ios_sources
|
||||
}
|
||||
test("net_unittests") {
|
||||
sources = gypi_values.net_test_sources
|
||||
|
||||
if (is_chromeos) {
|
||||
sources -= [
|
||||
"proxy/proxy_config_service_linux_unittest.cc",
|
||||
]
|
||||
}
|
||||
configs += [ ":net_win_size_truncation" ]
|
||||
defines = []
|
||||
|
||||
if (is_android) {
|
||||
sources -= [
|
||||
# See bug http://crbug.com/344533.
|
||||
"disk_cache/blockfile/index_table_v3_unittest.cc",
|
||||
# No res_ninit() et al on Android, so this doesn't make a lot of
|
||||
# sense.
|
||||
"dns/dns_config_service_posix_unittest.cc",
|
||||
deps = [
|
||||
":extras",
|
||||
":http_server",
|
||||
":net",
|
||||
":quic_tools",
|
||||
":test_support",
|
||||
"//base",
|
||||
"//base:i18n",
|
||||
"//base:prefs_test_support",
|
||||
"//base/allocator",
|
||||
"//base/third_party/dynamic_annotations",
|
||||
"//crypto",
|
||||
"//crypto:platform",
|
||||
"//crypto:test_support",
|
||||
"//net/base/registry_controlled_domains",
|
||||
"//testing/gmock",
|
||||
"//testing/gtest",
|
||||
"//third_party/zlib",
|
||||
"//url",
|
||||
]
|
||||
deps += [
|
||||
":net_javatests", # FIXME(brettw)
|
||||
":net_test_jni_headers",
|
||||
]
|
||||
}
|
||||
|
||||
if (!use_nss_certs) {
|
||||
sources -= [
|
||||
"ssl/client_cert_store_nss_unittest.cc",
|
||||
]
|
||||
if (is_chromeos) { # Already removed for all non-ChromeOS builds.
|
||||
sources -= [
|
||||
"ssl/client_cert_store_chromeos_unittest.cc",
|
||||
if (is_linux) {
|
||||
sources += gypi_values.net_linux_test_sources
|
||||
deps += [
|
||||
":balsa",
|
||||
":epoll_server",
|
||||
":flip_in_mem_edsm_server_base",
|
||||
":quic_base",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
if (use_openssl) {
|
||||
# When building for OpenSSL, we need to exclude NSS specific tests
|
||||
# or functionality not supported by OpenSSL yet.
|
||||
# TODO(bulach): Add equivalent tests when the underlying
|
||||
# functionality is ported to OpenSSL.
|
||||
sources -= [
|
||||
"cert/nss_cert_database_unittest.cc",
|
||||
"cert/x509_util_nss_unittest.cc",
|
||||
"quic/test_tools/crypto_test_utils_nss.cc",
|
||||
]
|
||||
if (is_mac || is_ios) {
|
||||
sources += gypi_values.net_base_test_mac_ios_sources
|
||||
}
|
||||
|
||||
if (is_chromeos) {
|
||||
# These were already removed in the non-ChromeOS case.
|
||||
sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ]
|
||||
}
|
||||
|
||||
if (is_android) {
|
||||
sources -= [
|
||||
"cert/nss_cert_database_chromeos_unittest.cc",
|
||||
"cert/nss_profile_filter_chromeos_unittest.cc",
|
||||
# See bug http://crbug.com/344533.
|
||||
"disk_cache/blockfile/index_table_v3_unittest.cc",
|
||||
|
||||
# No res_ninit() et al on Android, so this doesn't make a lot of
|
||||
# sense.
|
||||
"dns/dns_config_service_posix_unittest.cc",
|
||||
]
|
||||
deps += [
|
||||
":net_javatests", # FIXME(brettw)
|
||||
":net_test_jni_headers",
|
||||
]
|
||||
}
|
||||
} else {
|
||||
sources -= [
|
||||
"cert/x509_util_openssl_unittest.cc",
|
||||
"quic/test_tools/crypto_test_utils_openssl.cc",
|
||||
"socket/ssl_client_socket_openssl_unittest.cc",
|
||||
"socket/ssl_session_cache_openssl_unittest.cc",
|
||||
]
|
||||
if (!is_desktop_linux && !is_chromeos) {
|
||||
sources -= [ "cert/nss_cert_database_unittest.cc" ]
|
||||
|
||||
if (!use_nss_certs) {
|
||||
sources -= [ "ssl/client_cert_store_nss_unittest.cc" ]
|
||||
if (is_chromeos) { # Already removed for all non-ChromeOS builds.
|
||||
sources -= [ "ssl/client_cert_store_chromeos_unittest.cc" ]
|
||||
}
|
||||
}
|
||||
|
||||
if (use_openssl) {
|
||||
# When building for OpenSSL, we need to exclude NSS specific tests
|
||||
# or functionality not supported by OpenSSL yet.
|
||||
# TODO(bulach): Add equivalent tests when the underlying
|
||||
# functionality is ported to OpenSSL.
|
||||
sources -= [
|
||||
"cert/nss_cert_database_unittest.cc",
|
||||
"cert/x509_util_nss_unittest.cc",
|
||||
"quic/test_tools/crypto_test_utils_nss.cc",
|
||||
]
|
||||
if (is_chromeos) {
|
||||
# These were already removed in the non-ChromeOS case.
|
||||
sources -= [
|
||||
"cert/nss_cert_database_chromeos_unittest.cc",
|
||||
"cert/nss_profile_filter_chromeos_unittest.cc",
|
||||
]
|
||||
}
|
||||
} else {
|
||||
sources -= [
|
||||
"cert/x509_util_openssl_unittest.cc",
|
||||
"quic/test_tools/crypto_test_utils_openssl.cc",
|
||||
"socket/ssl_client_socket_openssl_unittest.cc",
|
||||
"socket/ssl_session_cache_openssl_unittest.cc",
|
||||
]
|
||||
if (!is_desktop_linux && !is_chromeos) {
|
||||
sources -= [ "cert/nss_cert_database_unittest.cc" ]
|
||||
}
|
||||
}
|
||||
|
||||
if (use_kerberos) {
|
||||
defines += [ "USE_KERBEROS" ]
|
||||
} else {
|
||||
sources -= [
|
||||
"http/http_auth_gssapi_posix_unittest.cc",
|
||||
"http/http_auth_handler_negotiate_unittest.cc",
|
||||
"http/mock_gssapi_library_posix.cc",
|
||||
"http/mock_gssapi_library_posix.h",
|
||||
]
|
||||
}
|
||||
|
||||
if (use_openssl || (!is_desktop_linux && !is_chromeos && !is_ios)) {
|
||||
# Only include this test when on Posix and using NSS for
|
||||
# cert verification or on iOS (which also uses NSS for certs).
|
||||
sources -= [ "ocsp/nss_ocsp_unittest.cc" ]
|
||||
}
|
||||
|
||||
if (!use_openssl_certs) {
|
||||
sources -= [ "ssl/openssl_client_key_store_unittest.cc" ]
|
||||
}
|
||||
|
||||
if (!enable_websockets) {
|
||||
sources -= [
|
||||
"websockets/websocket_basic_stream_test.cc",
|
||||
"websockets/websocket_channel_test.cc",
|
||||
"websockets/websocket_deflate_predictor_impl_test.cc",
|
||||
"websockets/websocket_deflate_stream_test.cc",
|
||||
"websockets/websocket_deflater_test.cc",
|
||||
"websockets/websocket_errors_test.cc",
|
||||
"websockets/websocket_extension_parser_test.cc",
|
||||
"websockets/websocket_frame_parser_test.cc",
|
||||
"websockets/websocket_frame_test.cc",
|
||||
"websockets/websocket_handshake_challenge_test.cc",
|
||||
"websockets/websocket_handshake_stream_create_helper_test.cc",
|
||||
"websockets/websocket_inflater_test.cc",
|
||||
"websockets/websocket_stream_test.cc",
|
||||
"websockets/websocket_test_util.cc",
|
||||
"websockets/websocket_test_util.h",
|
||||
]
|
||||
}
|
||||
|
||||
if (disable_file_support) {
|
||||
sources -= [
|
||||
"base/directory_lister_unittest.cc",
|
||||
"url_request/url_request_file_job_unittest.cc",
|
||||
]
|
||||
}
|
||||
|
||||
if (disable_ftp_support) {
|
||||
sources -= [
|
||||
"ftp/ftp_auth_cache_unittest.cc",
|
||||
"ftp/ftp_ctrl_response_buffer_unittest.cc",
|
||||
"ftp/ftp_directory_listing_parser_ls_unittest.cc",
|
||||
"ftp/ftp_directory_listing_parser_netware_unittest.cc",
|
||||
"ftp/ftp_directory_listing_parser_os2_unittest.cc",
|
||||
"ftp/ftp_directory_listing_parser_unittest.cc",
|
||||
"ftp/ftp_directory_listing_parser_unittest.h",
|
||||
"ftp/ftp_directory_listing_parser_vms_unittest.cc",
|
||||
"ftp/ftp_directory_listing_parser_windows_unittest.cc",
|
||||
"ftp/ftp_network_transaction_unittest.cc",
|
||||
"ftp/ftp_util_unittest.cc",
|
||||
"url_request/url_request_ftp_job_unittest.cc",
|
||||
]
|
||||
}
|
||||
|
||||
if (!enable_built_in_dns) {
|
||||
sources -= [
|
||||
"dns/address_sorter_posix_unittest.cc",
|
||||
"dns/address_sorter_unittest.cc",
|
||||
]
|
||||
}
|
||||
|
||||
# Always need use_v8_in_net to be 1 to run on Android, so just remove
|
||||
# net_unittest's dependency on v8 when using icu alternatives instead of
|
||||
# setting use_v8_in_net to 0.
|
||||
if (use_v8_in_net && !use_icu_alternatives_on_android) {
|
||||
deps += [ ":net_with_v8" ]
|
||||
} else {
|
||||
sources -= [
|
||||
"proxy/proxy_resolver_v8_unittest.cc",
|
||||
"proxy/proxy_resolver_v8_tracing_unittest.cc",
|
||||
]
|
||||
}
|
||||
|
||||
if (!enable_mdns) {
|
||||
sources -= [
|
||||
"dns/mdns_cache_unittest.cc",
|
||||
"dns/mdns_client_unittest.cc",
|
||||
"dns/record_parsed_unittest.cc",
|
||||
"dns/record_rdata_unittest.cc",
|
||||
]
|
||||
}
|
||||
|
||||
if (is_ios) {
|
||||
# TODO(GYP)
|
||||
# 'actions': [
|
||||
# {
|
||||
# 'action_name': 'copy_test_data',
|
||||
# 'variables': {
|
||||
# 'test_data_files': [
|
||||
# 'data/ssl/certificates/',
|
||||
# 'data/test.html',
|
||||
# 'data/url_request_unittest/',
|
||||
# ],
|
||||
# 'test_data_prefix': 'net',
|
||||
# },
|
||||
# 'includes': [ '../build/copy_test_data_ios.gypi' ],
|
||||
# },
|
||||
# ],
|
||||
sources -= [
|
||||
# TODO(droger): The following tests are disabled because the
|
||||
# implementation is missing or incomplete.
|
||||
# KeygenHandler::GenKeyAndSignChallenge() is not ported to iOS.
|
||||
"base/keygen_handler_unittest.cc",
|
||||
"disk_cache/backend_unittest.cc",
|
||||
"disk_cache/blockfile/block_files_unittest.cc",
|
||||
|
||||
# Need to read input data files.
|
||||
"filter/gzip_filter_unittest.cc",
|
||||
"socket/ssl_server_socket_unittest.cc",
|
||||
"spdy/fuzzing/hpack_fuzz_util_test.cc",
|
||||
|
||||
# Need TestServer.
|
||||
"proxy/proxy_script_fetcher_impl_unittest.cc",
|
||||
"socket/ssl_client_socket_unittest.cc",
|
||||
"url_request/url_fetcher_impl_unittest.cc",
|
||||
"url_request/url_request_context_builder_unittest.cc",
|
||||
|
||||
# Needs GetAppOutput().
|
||||
"test/python_utils_unittest.cc",
|
||||
|
||||
# The following tests are disabled because they don't apply to
|
||||
# iOS.
|
||||
# OS is not "linux" or "freebsd" or "openbsd".
|
||||
"socket/unix_domain_client_socket_posix_unittest.cc",
|
||||
"socket/unix_domain_listen_socket_posix_unittest.cc",
|
||||
"socket/unix_domain_server_socket_posix_unittest.cc",
|
||||
|
||||
# See bug http://crbug.com/344533.
|
||||
"disk_cache/blockfile/index_table_v3_unittest.cc",
|
||||
]
|
||||
}
|
||||
|
||||
if (is_android) {
|
||||
sources -= [ "dns/dns_config_service_posix_unittest.cc" ]
|
||||
|
||||
# TODO(GYP)
|
||||
# # TODO(mmenke): This depends on test_support_base, which depends on
|
||||
# # icu. Figure out a way to remove that dependency.
|
||||
# 'dependencies': [
|
||||
# '../testing/android/native_test.gyp:native_test_native_code',
|
||||
# ]
|
||||
|
||||
set_sources_assignment_filter([])
|
||||
sources += [ "base/address_tracker_linux_unittest.cc" ]
|
||||
set_sources_assignment_filter(sources_assignment_filter)
|
||||
}
|
||||
|
||||
if (use_icu_alternatives_on_android) {
|
||||
sources -= [
|
||||
"base/filename_util_unittest.cc",
|
||||
"base/net_util_icu_unittest.cc",
|
||||
]
|
||||
deps -= [ "//base:i18n" ]
|
||||
}
|
||||
}
|
||||
|
||||
if (use_kerberos) {
|
||||
defines += [ "USE_KERBEROS" ]
|
||||
} else {
|
||||
sources -= [
|
||||
"http/http_auth_gssapi_posix_unittest.cc",
|
||||
"http/http_auth_handler_negotiate_unittest.cc",
|
||||
"http/mock_gssapi_library_posix.cc",
|
||||
"http/mock_gssapi_library_posix.h",
|
||||
executable("quic_server") {
|
||||
sources = [
|
||||
"quic/quic_server_bin.cc",
|
||||
]
|
||||
deps = [
|
||||
":quic_tools",
|
||||
":net",
|
||||
"//base",
|
||||
"//third_party/boringssl",
|
||||
]
|
||||
}
|
||||
|
||||
if (use_openssl || (!is_desktop_linux && !is_chromeos && !is_ios)) {
|
||||
# Only include this test when on Posix and using NSS for
|
||||
# cert verification or on iOS (which also uses NSS for certs).
|
||||
sources -= [ "ocsp/nss_ocsp_unittest.cc" ]
|
||||
}
|
||||
|
||||
if (!use_openssl_certs) {
|
||||
sources -= [ "ssl/openssl_client_key_store_unittest.cc" ]
|
||||
}
|
||||
|
||||
if (!enable_websockets) {
|
||||
sources -= [
|
||||
"websockets/websocket_basic_stream_test.cc",
|
||||
"websockets/websocket_channel_test.cc",
|
||||
"websockets/websocket_deflate_predictor_impl_test.cc",
|
||||
"websockets/websocket_deflate_stream_test.cc",
|
||||
"websockets/websocket_deflater_test.cc",
|
||||
"websockets/websocket_errors_test.cc",
|
||||
"websockets/websocket_extension_parser_test.cc",
|
||||
"websockets/websocket_frame_parser_test.cc",
|
||||
"websockets/websocket_frame_test.cc",
|
||||
"websockets/websocket_handshake_challenge_test.cc",
|
||||
"websockets/websocket_handshake_stream_create_helper_test.cc",
|
||||
"websockets/websocket_inflater_test.cc",
|
||||
"websockets/websocket_stream_test.cc",
|
||||
"websockets/websocket_test_util.cc",
|
||||
"websockets/websocket_test_util.h",
|
||||
]
|
||||
}
|
||||
|
||||
if (disable_file_support) {
|
||||
sources -= [
|
||||
"base/directory_lister_unittest.cc",
|
||||
"url_request/url_request_file_job_unittest.cc",
|
||||
]
|
||||
}
|
||||
|
||||
if (disable_ftp_support) {
|
||||
sources -= [
|
||||
"ftp/ftp_auth_cache_unittest.cc",
|
||||
"ftp/ftp_ctrl_response_buffer_unittest.cc",
|
||||
"ftp/ftp_directory_listing_parser_ls_unittest.cc",
|
||||
"ftp/ftp_directory_listing_parser_netware_unittest.cc",
|
||||
"ftp/ftp_directory_listing_parser_os2_unittest.cc",
|
||||
"ftp/ftp_directory_listing_parser_unittest.cc",
|
||||
"ftp/ftp_directory_listing_parser_unittest.h",
|
||||
"ftp/ftp_directory_listing_parser_vms_unittest.cc",
|
||||
"ftp/ftp_directory_listing_parser_windows_unittest.cc",
|
||||
"ftp/ftp_network_transaction_unittest.cc",
|
||||
"ftp/ftp_util_unittest.cc",
|
||||
"url_request/url_request_ftp_job_unittest.cc",
|
||||
]
|
||||
}
|
||||
|
||||
if (!enable_built_in_dns) {
|
||||
sources -= [
|
||||
"dns/address_sorter_posix_unittest.cc",
|
||||
"dns/address_sorter_unittest.cc",
|
||||
]
|
||||
}
|
||||
|
||||
# Always need use_v8_in_net to be 1 to run on Android, so just remove
|
||||
# net_unittest's dependency on v8 when using icu alternatives instead of
|
||||
# setting use_v8_in_net to 0.
|
||||
if (use_v8_in_net && !use_icu_alternatives_on_android) {
|
||||
deps += [ ":net_with_v8" ]
|
||||
} else {
|
||||
sources -= [
|
||||
"proxy/proxy_resolver_v8_unittest.cc",
|
||||
"proxy/proxy_resolver_v8_tracing_unittest.cc",
|
||||
]
|
||||
}
|
||||
|
||||
if (!enable_mdns) {
|
||||
sources -= [
|
||||
"dns/mdns_cache_unittest.cc",
|
||||
"dns/mdns_client_unittest.cc",
|
||||
"dns/record_parsed_unittest.cc",
|
||||
"dns/record_rdata_unittest.cc",
|
||||
]
|
||||
}
|
||||
|
||||
if (is_ios) {
|
||||
# TODO(GYP)
|
||||
# 'actions': [
|
||||
# {
|
||||
# 'action_name': 'copy_test_data',
|
||||
# 'variables': {
|
||||
# 'test_data_files': [
|
||||
# 'data/ssl/certificates/',
|
||||
# 'data/test.html',
|
||||
# 'data/url_request_unittest/',
|
||||
# ],
|
||||
# 'test_data_prefix': 'net',
|
||||
# },
|
||||
# 'includes': [ '../build/copy_test_data_ios.gypi' ],
|
||||
# },
|
||||
# ],
|
||||
sources -= [
|
||||
# TODO(droger): The following tests are disabled because the
|
||||
# implementation is missing or incomplete.
|
||||
# KeygenHandler::GenKeyAndSignChallenge() is not ported to iOS.
|
||||
"base/keygen_handler_unittest.cc",
|
||||
"disk_cache/backend_unittest.cc",
|
||||
"disk_cache/blockfile/block_files_unittest.cc",
|
||||
# Need to read input data files.
|
||||
"filter/gzip_filter_unittest.cc",
|
||||
"socket/ssl_server_socket_unittest.cc",
|
||||
"spdy/fuzzing/hpack_fuzz_util_test.cc",
|
||||
# Need TestServer.
|
||||
"proxy/proxy_script_fetcher_impl_unittest.cc",
|
||||
"socket/ssl_client_socket_unittest.cc",
|
||||
"url_request/url_fetcher_impl_unittest.cc",
|
||||
"url_request/url_request_context_builder_unittest.cc",
|
||||
# Needs GetAppOutput().
|
||||
"test/python_utils_unittest.cc",
|
||||
|
||||
# The following tests are disabled because they don't apply to
|
||||
# iOS.
|
||||
# OS is not "linux" or "freebsd" or "openbsd".
|
||||
"socket/unix_domain_client_socket_posix_unittest.cc",
|
||||
"socket/unix_domain_listen_socket_posix_unittest.cc",
|
||||
"socket/unix_domain_server_socket_posix_unittest.cc",
|
||||
|
||||
# See bug http://crbug.com/344533.
|
||||
"disk_cache/blockfile/index_table_v3_unittest.cc",
|
||||
]
|
||||
}
|
||||
|
||||
if (is_android) {
|
||||
sources -= [
|
||||
"dns/dns_config_service_posix_unittest.cc",
|
||||
]
|
||||
# TODO(GYP)
|
||||
# # TODO(mmenke): This depends on test_support_base, which depends on
|
||||
# # icu. Figure out a way to remove that dependency.
|
||||
# 'dependencies': [
|
||||
# '../testing/android/native_test.gyp:native_test_native_code',
|
||||
# ]
|
||||
|
||||
set_sources_assignment_filter([])
|
||||
sources += [ "base/address_tracker_linux_unittest.cc" ]
|
||||
set_sources_assignment_filter(sources_assignment_filter)
|
||||
}
|
||||
|
||||
if (use_icu_alternatives_on_android) {
|
||||
sources -= [
|
||||
"base/filename_util_unittest.cc",
|
||||
"base/net_util_icu_unittest.cc",
|
||||
]
|
||||
deps -= [ "//base:i18n" ]
|
||||
}
|
||||
}
|
||||
|
||||
executable("quic_server") {
|
||||
sources = [ "quic/quic_server_bin.cc" ]
|
||||
deps = [
|
||||
":quic_tools",
|
||||
":net",
|
||||
"//base",
|
||||
"//third_party/boringssl",
|
||||
]
|
||||
}
|
||||
|
||||
} # !is_android && !is_win && !is_mac
|
||||
|
||||
@ -19,7 +19,8 @@ android_library("net_java") {
|
||||
}
|
||||
|
||||
android_aidl("remote_android_keystore_aidl") {
|
||||
interface_file = "java/src/org/chromium/net/IRemoteAndroidKeyStoreInterface.aidl"
|
||||
interface_file =
|
||||
"java/src/org/chromium/net/IRemoteAndroidKeyStoreInterface.aidl"
|
||||
sources = [
|
||||
"java/src/org/chromium/net/IRemoteAndroidKeyStore.aidl",
|
||||
"java/src/org/chromium/net/IRemoteAndroidKeyStoreCallbacks.aidl",
|
||||
@ -45,7 +46,7 @@ java_cpp_template("net_errors_java") {
|
||||
"java/NetError.template",
|
||||
]
|
||||
inputs = [
|
||||
"../base/net_error_list.h"
|
||||
"../base/net_error_list.h",
|
||||
]
|
||||
}
|
||||
|
||||
@ -54,7 +55,7 @@ java_cpp_enum("net_android_java_enums_srcjar") {
|
||||
"../base/mime_util.h",
|
||||
"../base/network_change_notifier.h",
|
||||
"cert_verify_result_android.h",
|
||||
"keystore.h"
|
||||
"keystore.h",
|
||||
]
|
||||
outputs = [
|
||||
"org/chromium/net/CertificateMimeType.java",
|
||||
|
||||
@ -14,10 +14,11 @@ action_foreach("registry_controlled_domains") {
|
||||
"effective_tld_names_unittest6.gperf",
|
||||
]
|
||||
outputs = [
|
||||
"${target_gen_dir}/{{source_name_part}}-inc.cc"
|
||||
"${target_gen_dir}/{{source_name_part}}-inc.cc",
|
||||
]
|
||||
args = [
|
||||
"{{source}}",
|
||||
rebase_path("${target_gen_dir}/{{source_name_part}}-inc.cc", root_build_dir)
|
||||
rebase_path("${target_gen_dir}/{{source_name_part}}-inc.cc",
|
||||
root_build_dir),
|
||||
]
|
||||
}
|
||||
|
||||
8
net/third_party/nss/ssl/BUILD.gn
vendored
8
net/third_party/nss/ssl/BUILD.gn
vendored
@ -90,9 +90,7 @@ component("libssl") {
|
||||
|
||||
# Must be after ssl_config since we want our SSL headers to take
|
||||
# precedence.
|
||||
public_configs += [
|
||||
"//third_party/nss:system_nss_no_ssl_config"
|
||||
]
|
||||
public_configs += [ "//third_party/nss:system_nss_no_ssl_config" ]
|
||||
} else if (is_mac) {
|
||||
libs = [ "Security.framework" ]
|
||||
}
|
||||
@ -118,9 +116,7 @@ component("libssl") {
|
||||
}
|
||||
|
||||
if (is_mac || is_ios || is_win) {
|
||||
sources -= [
|
||||
"bodge/secitem_array.c",
|
||||
]
|
||||
sources -= [ "bodge/secitem_array.c" ]
|
||||
public_deps = [
|
||||
"//third_party/nss:nspr",
|
||||
"//third_party/nss:nss",
|
||||
|
||||
@ -95,5 +95,4 @@ shared_library("pdf") {
|
||||
"//third_party/pdfium",
|
||||
]
|
||||
}
|
||||
|
||||
# TODO(GYP) pdf_linux_symbols target.
|
||||
|
||||
@ -2,17 +2,16 @@
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
gypi_values = exec_script(
|
||||
"//build/gypi_to_gn.py",
|
||||
[ rebase_path("ppapi_sources.gypi") ],
|
||||
"scope",
|
||||
[ "ppapi_sources.gypi" ])
|
||||
gypi_values = exec_script("//build/gypi_to_gn.py",
|
||||
[ rebase_path("ppapi_sources.gypi") ],
|
||||
"scope",
|
||||
[ "ppapi_sources.gypi" ])
|
||||
|
||||
# TODO(GYP) support chrome_multiple_dll
|
||||
#if (chrome_multiple_dll) {
|
||||
# blink_target = "//third_party/WebKit/public:blink_minimal"
|
||||
#} else {
|
||||
blink_target = "//third_party/WebKit/public:blink"
|
||||
blink_target = "//third_party/WebKit/public:blink"
|
||||
#}
|
||||
|
||||
# These are just headers.
|
||||
@ -23,16 +22,16 @@ source_set("ppapi_c") {
|
||||
# Some targets need to depend on the PPAPI version only. This target exists so
|
||||
# they can include this header without header check warnings.
|
||||
source_set("ppapi_macros") {
|
||||
sources = [ "c/pp_macros.h" ]
|
||||
sources = [
|
||||
"c/pp_macros.h",
|
||||
]
|
||||
}
|
||||
|
||||
source_set("ppapi_cpp_objects") {
|
||||
sources = gypi_values.cpp_source_files
|
||||
|
||||
if (is_win) {
|
||||
cflags = [
|
||||
"/we4244", # Implicit conversion, possible loss of data.
|
||||
]
|
||||
cflags = [ "/we4244" ] # Implicit conversion, possible loss of data.
|
||||
} else {
|
||||
cflags = [
|
||||
"-Wextra",
|
||||
@ -208,14 +207,13 @@ component("ppapi_shared") {
|
||||
"shared_impl/var.h",
|
||||
"shared_impl/var_tracker.cc",
|
||||
"shared_impl/var_tracker.h",
|
||||
|
||||
# TODO(viettrungluu): Split these out; it won"t be used in NaCl.
|
||||
"shared_impl/private/net_address_private_impl.cc",
|
||||
"shared_impl/private/net_address_private_impl_constants.cc",
|
||||
"shared_impl/private/net_address_private_impl.h",
|
||||
|
||||
"shared_impl/private/ppb_x509_certificate_private_shared.cc",
|
||||
"shared_impl/private/ppb_x509_certificate_private_shared.h",
|
||||
|
||||
"thunk/enter.cc",
|
||||
"thunk/enter.h",
|
||||
"thunk/ppb_audio_api.h",
|
||||
@ -487,7 +485,6 @@ component("ppapi_proxy") {
|
||||
# These callback files are standalone.
|
||||
"cpp/completion_callback.h",
|
||||
"utility/completion_callback_factory.h",
|
||||
|
||||
"proxy/audio_buffer_resource.cc",
|
||||
"proxy/audio_buffer_resource.h",
|
||||
"proxy/broker_resource.cc",
|
||||
@ -817,5 +814,4 @@ static_library("ppapi_unittest_shared") {
|
||||
"//testing/gtest",
|
||||
]
|
||||
}
|
||||
|
||||
# TODO(GYP) other targets from ppapi_tests.gyp
|
||||
|
||||
@ -91,9 +91,7 @@ component("printing") {
|
||||
if (is_mac) {
|
||||
# Mac-Aura does not support printing.
|
||||
if (use_aura) {
|
||||
sources -= [
|
||||
"printed_document_mac.cc",
|
||||
]
|
||||
sources -= [ "printed_document_mac.cc" ]
|
||||
} else {
|
||||
sources += [
|
||||
"printing_context_mac.mm",
|
||||
@ -126,7 +124,8 @@ component("printing") {
|
||||
configs += [ ":cups" ]
|
||||
|
||||
if (is_linux) {
|
||||
cups_version = exec_script("cups_config_helper.py", [ "--api-version" ],
|
||||
cups_version = exec_script("cups_config_helper.py",
|
||||
[ "--api-version" ],
|
||||
"trim string")
|
||||
|
||||
if (cups_version == "1.6" || cups_version == "1.7") {
|
||||
@ -167,9 +166,7 @@ component("printing") {
|
||||
# of the print backend and enables a custom implementation instead.
|
||||
defines += [ "PRINT_BACKEND_AVAILABLE" ]
|
||||
|
||||
sources += [
|
||||
"backend/print_backend_chromeos.cc",
|
||||
]
|
||||
sources += [ "backend/print_backend_chromeos.cc" ]
|
||||
} else if (is_linux) { # Non-ChromeOS Linux.
|
||||
sources += [
|
||||
"printing_context_linux.cc",
|
||||
@ -243,7 +240,7 @@ if (is_android) {
|
||||
# GYP: //printing/printing.gyp:printing_java
|
||||
android_library("printing_java") {
|
||||
deps = [
|
||||
"//base:base_java"
|
||||
"//base:base_java",
|
||||
]
|
||||
DEPRECATED_java_in_dir = "android/java/src"
|
||||
}
|
||||
|
||||
@ -3,14 +3,12 @@
|
||||
# found in the LICENSE file.
|
||||
|
||||
static_library("base") {
|
||||
gypi_values = exec_script(
|
||||
"//build/gypi_to_gn.py",
|
||||
[ rebase_path("../remoting_srcs.gypi")],
|
||||
"scope",
|
||||
[ "../remoting_srcs.gypi" ])
|
||||
gypi_values = exec_script("//build/gypi_to_gn.py",
|
||||
[ rebase_path("../remoting_srcs.gypi") ],
|
||||
"scope",
|
||||
[ "../remoting_srcs.gypi" ])
|
||||
|
||||
sources = rebase_path(
|
||||
gypi_values.remoting_base_sources, ".", "//remoting")
|
||||
sources = rebase_path(gypi_values.remoting_base_sources, ".", "//remoting")
|
||||
|
||||
configs += [ "//build/config/compiler:wexit_time_destructors" ]
|
||||
|
||||
@ -34,4 +32,3 @@ static_library("base") {
|
||||
"//ui/gfx/geometry",
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@ -5,14 +5,12 @@
|
||||
import("//remoting/remoting_version.gni")
|
||||
|
||||
static_library("client") {
|
||||
gypi_values = exec_script(
|
||||
"//build/gypi_to_gn.py",
|
||||
[ rebase_path("../remoting_srcs.gypi")],
|
||||
"scope",
|
||||
[ "../remoting_srcs.gypi" ])
|
||||
gypi_values = exec_script("//build/gypi_to_gn.py",
|
||||
[ rebase_path("../remoting_srcs.gypi") ],
|
||||
"scope",
|
||||
[ "../remoting_srcs.gypi" ])
|
||||
|
||||
sources = rebase_path(
|
||||
gypi_values.remoting_client_sources, ".", "//remoting")
|
||||
sources = rebase_path(gypi_values.remoting_client_sources, ".", "//remoting")
|
||||
|
||||
configs += [ "//build/config/compiler:wexit_time_destructors" ]
|
||||
|
||||
|
||||
@ -3,14 +3,13 @@
|
||||
# found in the LICENSE file.
|
||||
|
||||
static_library("plugin") {
|
||||
gypi_values = exec_script(
|
||||
"//build/gypi_to_gn.py",
|
||||
[ rebase_path("../../remoting_srcs.gypi")],
|
||||
"scope",
|
||||
[ "../../remoting_srcs.gypi" ])
|
||||
gypi_values = exec_script("//build/gypi_to_gn.py",
|
||||
[ rebase_path("../../remoting_srcs.gypi") ],
|
||||
"scope",
|
||||
[ "../../remoting_srcs.gypi" ])
|
||||
|
||||
sources = rebase_path(
|
||||
gypi_values.remoting_client_plugin_sources, ".", "//remoting")
|
||||
sources =
|
||||
rebase_path(gypi_values.remoting_client_plugin_sources, ".", "//remoting")
|
||||
|
||||
# TODO(brettw) when a nacl version of this target is made, these files
|
||||
# won't be part of it.
|
||||
|
||||
@ -7,14 +7,12 @@ import("//build/config/ui.gni")
|
||||
import("//remoting/remoting_version.gni")
|
||||
|
||||
static_library("host") {
|
||||
gypi_values = exec_script(
|
||||
"//build/gypi_to_gn.py",
|
||||
[ rebase_path("../remoting_host_srcs.gypi")],
|
||||
"scope",
|
||||
[ "../remoting_host_srcs.gypi" ])
|
||||
gypi_values = exec_script("//build/gypi_to_gn.py",
|
||||
[ rebase_path("../remoting_host_srcs.gypi") ],
|
||||
"scope",
|
||||
[ "../remoting_host_srcs.gypi" ])
|
||||
|
||||
sources = rebase_path(
|
||||
gypi_values.remoting_host_sources, ".", "//remoting")
|
||||
sources = rebase_path(gypi_values.remoting_host_sources, ".", "//remoting")
|
||||
|
||||
libs = []
|
||||
|
||||
@ -105,9 +103,7 @@ static_library("host") {
|
||||
"libpam.a",
|
||||
]
|
||||
|
||||
deps += [
|
||||
"//google_toolbox_for_mac"
|
||||
]
|
||||
deps += [ "//google_toolbox_for_mac" ]
|
||||
}
|
||||
|
||||
if (enable_webrtc) {
|
||||
@ -116,7 +112,6 @@ static_library("host") {
|
||||
"//third_party/webrtc/modules/desktop_capture",
|
||||
]
|
||||
|
||||
sources += rebase_path(
|
||||
gypi_values.remoting_cast_sources, ".", "//remoting")
|
||||
sources += rebase_path(gypi_values.remoting_cast_sources, ".", "//remoting")
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,14 +7,14 @@ import("//build/config/ui.gni")
|
||||
import("//remoting/remoting_version.gni")
|
||||
|
||||
static_library("common") {
|
||||
gypi_values = exec_script(
|
||||
"//build/gypi_to_gn.py",
|
||||
[ rebase_path("../../remoting_host_srcs.gypi")],
|
||||
"scope",
|
||||
[ "../../remoting_host_srcs.gypi" ])
|
||||
gypi_values = exec_script("//build/gypi_to_gn.py",
|
||||
[ rebase_path("../../remoting_host_srcs.gypi") ],
|
||||
"scope",
|
||||
[ "../../remoting_host_srcs.gypi" ])
|
||||
|
||||
sources = rebase_path(
|
||||
gypi_values.remoting_it2me_host_static_sources, ".", "//remoting")
|
||||
sources = rebase_path(gypi_values.remoting_it2me_host_static_sources,
|
||||
".",
|
||||
"//remoting")
|
||||
|
||||
configs += [ "//build/config/compiler:wexit_time_destructors" ]
|
||||
|
||||
@ -27,7 +27,5 @@ static_library("common") {
|
||||
"//remoting/resources",
|
||||
]
|
||||
|
||||
defines = [
|
||||
"VERSION=$version_full"
|
||||
]
|
||||
defines = [ "VERSION=$version_full" ]
|
||||
}
|
||||
|
||||
@ -11,6 +11,6 @@ proto_library("proto") {
|
||||
"event.proto",
|
||||
"internal.proto",
|
||||
"mux.proto",
|
||||
"video.proto"
|
||||
"video.proto",
|
||||
]
|
||||
}
|
||||
|
||||
@ -3,14 +3,13 @@
|
||||
# found in the LICENSE file.
|
||||
|
||||
static_library("protocol") {
|
||||
gypi_values = exec_script(
|
||||
"//build/gypi_to_gn.py",
|
||||
[ rebase_path("../remoting_srcs.gypi")],
|
||||
"scope",
|
||||
[ "../remoting_srcs.gypi" ])
|
||||
gypi_values = exec_script("//build/gypi_to_gn.py",
|
||||
[ rebase_path("../remoting_srcs.gypi") ],
|
||||
"scope",
|
||||
[ "../remoting_srcs.gypi" ])
|
||||
|
||||
sources = rebase_path(
|
||||
gypi_values.remoting_protocol_sources, ".", "//remoting")
|
||||
sources =
|
||||
rebase_path(gypi_values.remoting_protocol_sources, ".", "//remoting")
|
||||
|
||||
configs += [ "//build/config/compiler:wexit_time_destructors" ]
|
||||
|
||||
|
||||
@ -21,50 +21,66 @@ _script_deps = [
|
||||
|
||||
_chrome_version_path = rebase_path(_chrome_version_abspath, root_build_dir)
|
||||
_remoting_version_path = rebase_path(_remoting_version_abspath, root_build_dir)
|
||||
_remoting_branding_path = rebase_path(_remoting_branding_abspath,
|
||||
root_build_dir)
|
||||
_remoting_branding_path =
|
||||
rebase_path(_remoting_branding_abspath, root_build_dir)
|
||||
|
||||
version_major = exec_script(
|
||||
_version_py_abspath,
|
||||
[ "-f", _chrome_version_path,
|
||||
"-f", _remoting_version_path,
|
||||
"-t \"@MAJOR@\"" ],
|
||||
"value",
|
||||
_script_deps)
|
||||
version_major = exec_script(_version_py_abspath,
|
||||
[
|
||||
"-f",
|
||||
_chrome_version_path,
|
||||
"-f",
|
||||
_remoting_version_path,
|
||||
"-t \"@MAJOR@\"",
|
||||
],
|
||||
"value",
|
||||
_script_deps)
|
||||
|
||||
version_minor = exec_script(
|
||||
_version_py_abspath,
|
||||
[ "-f", _remoting_version_path,
|
||||
"-t \"@REMOTING_PATCH@\"" ],
|
||||
"value",
|
||||
_script_deps)
|
||||
version_minor = exec_script(_version_py_abspath,
|
||||
[
|
||||
"-f",
|
||||
_remoting_version_path,
|
||||
"-t \"@REMOTING_PATCH@\"",
|
||||
],
|
||||
"value",
|
||||
_script_deps)
|
||||
|
||||
version_short = "${version_major}.${version_minor}." + exec_script(
|
||||
_version_py_abspath,
|
||||
[ "-f", _chrome_version_path,
|
||||
"-f", _remoting_version_path,
|
||||
"-t \"@BUILD@\"" ],
|
||||
"value",
|
||||
_script_deps)
|
||||
version_short =
|
||||
"${version_major}.${version_minor}." + exec_script(_version_py_abspath,
|
||||
[
|
||||
"-f",
|
||||
_chrome_version_path,
|
||||
"-f",
|
||||
_remoting_version_path,
|
||||
"-t \"@BUILD@\"",
|
||||
],
|
||||
"value",
|
||||
_script_deps)
|
||||
|
||||
version_full = "${version_short}." + exec_script(
|
||||
_version_py_abspath,
|
||||
[ "-f", _chrome_version_path,
|
||||
"-f", _remoting_version_path,
|
||||
"-t \"@PATCH@\"" ],
|
||||
"value",
|
||||
_script_deps)
|
||||
version_full = "${version_short}." + exec_script(_version_py_abspath,
|
||||
[
|
||||
"-f",
|
||||
_chrome_version_path,
|
||||
"-f",
|
||||
_remoting_version_path,
|
||||
"-t \"@PATCH@\"",
|
||||
],
|
||||
"value",
|
||||
_script_deps)
|
||||
|
||||
prefpane_bundle_name = exec_script(
|
||||
_version_py_abspath,
|
||||
[ "-f", _remoting_branding_path,
|
||||
"-t \"@MAC_PREFPANE_BUNDLE_NAME@\"" ],
|
||||
"value",
|
||||
_script_deps)
|
||||
prefpane_bundle_name = exec_script(_version_py_abspath,
|
||||
[
|
||||
"-f",
|
||||
_remoting_branding_path,
|
||||
"-t \"@MAC_PREFPANE_BUNDLE_NAME@\"",
|
||||
],
|
||||
"value",
|
||||
_script_deps)
|
||||
|
||||
host_bundle_name = exec_script(
|
||||
_version_py_abspath,
|
||||
[ "-f", _remoting_branding_path,
|
||||
"-t \"@MAC_HOST_BUNDLE_NAME@\"" ],
|
||||
"value",
|
||||
_script_deps)
|
||||
host_bundle_name = exec_script(_version_py_abspath,
|
||||
[
|
||||
"-f",
|
||||
_remoting_branding_path,
|
||||
"-t \"@MAC_HOST_BUNDLE_NAME@\"",
|
||||
],
|
||||
"value",
|
||||
_script_deps)
|
||||
|
||||
@ -85,14 +85,15 @@ remoting_locales_with_underscores += [
|
||||
]
|
||||
|
||||
if (is_chromeos) {
|
||||
remoting_locales += ["en-US"]
|
||||
remoting_locales_with_underscores += ["en_US"]
|
||||
remoting_locales += [ "en-US" ]
|
||||
remoting_locales_with_underscores += [ "en_US" ]
|
||||
}
|
||||
|
||||
group("resources") {
|
||||
deps = [
|
||||
":copy_locales",
|
||||
":strings",
|
||||
|
||||
#":verify_resources", TODO(GYP) enable this.
|
||||
]
|
||||
}
|
||||
@ -100,49 +101,51 @@ group("resources") {
|
||||
# TODO(GYP) enable verify_resources. The bots are complaining about
|
||||
# gen/main.html not being found but this doesn't seems to reproduce locally.
|
||||
if (false) {
|
||||
action("verify_resources") {
|
||||
script = "//remoting/tools/verify_resources.py"
|
||||
|
||||
action("verify_resources") {
|
||||
script = "//remoting/tools/verify_resources.py"
|
||||
sources_to_verify = [
|
||||
"$root_gen_dir/main.html",
|
||||
"../base/resources_unittest.cc",
|
||||
"../host/continue_window_mac.mm",
|
||||
"../host/disconnect_window_mac.mm",
|
||||
"../host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings.jinja2",
|
||||
"../host/mac/me2me_preference_pane-InfoPlist.strings.jinja2",
|
||||
"../host/win/core.rc.jinja2",
|
||||
"../host/win/host_messages.mc.jinja2",
|
||||
"../host/win/version.rc.jinja2",
|
||||
"../resources/play_store_resources.cc",
|
||||
"../webapp/background/background.js",
|
||||
"../webapp/butter_bar.js",
|
||||
"../webapp/client_screen.js",
|
||||
"../webapp/error.js",
|
||||
"../webapp/host_list.js",
|
||||
"../webapp/host_setup_dialog.js",
|
||||
"../webapp/host_table_entry.js",
|
||||
"../webapp/manifest.json.jinja2",
|
||||
"../webapp/paired_client_manager.js",
|
||||
"../webapp/remoting.js",
|
||||
"../webapp/window_frame.js",
|
||||
]
|
||||
|
||||
sources_to_verify = [
|
||||
"$root_gen_dir/main.html",
|
||||
"../base/resources_unittest.cc",
|
||||
"../host/continue_window_mac.mm",
|
||||
"../host/disconnect_window_mac.mm",
|
||||
"../host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings.jinja2",
|
||||
"../host/mac/me2me_preference_pane-InfoPlist.strings.jinja2",
|
||||
"../host/win/core.rc.jinja2",
|
||||
"../host/win/host_messages.mc.jinja2",
|
||||
"../host/win/version.rc.jinja2",
|
||||
"../resources/play_store_resources.cc",
|
||||
"../webapp/background/background.js",
|
||||
"../webapp/butter_bar.js",
|
||||
"../webapp/client_screen.js",
|
||||
"../webapp/error.js",
|
||||
"../webapp/host_list.js",
|
||||
"../webapp/host_setup_dialog.js",
|
||||
"../webapp/host_table_entry.js",
|
||||
"../webapp/manifest.json.jinja2",
|
||||
"../webapp/paired_client_manager.js",
|
||||
"../webapp/remoting.js",
|
||||
"../webapp/window_frame.js",
|
||||
]
|
||||
inputs = [ "remoting_strings.grd" ] + sources_to_verify
|
||||
|
||||
inputs = [
|
||||
"remoting_strings.grd",
|
||||
] + sources_to_verify
|
||||
stampfile = "$root_build_dir/remoting_resources_verified_stamp"
|
||||
outputs = [
|
||||
stampfile,
|
||||
]
|
||||
|
||||
stampfile = "$root_build_dir/remoting_resources_verified_stamp"
|
||||
outputs = [ stampfile ]
|
||||
|
||||
args = [
|
||||
"-t", rebase_path(stampfile, root_build_dir),
|
||||
"-r", rebase_path("remoting_strings.grd", root_build_dir),
|
||||
] + rebase_path(sources_to_verify, root_build_dir)
|
||||
|
||||
deps = [ "//remoting/webapp:html" ] # Generates main.html.
|
||||
}
|
||||
args = [
|
||||
"-t",
|
||||
rebase_path(stampfile, root_build_dir),
|
||||
"-r",
|
||||
rebase_path("remoting_strings.grd", root_build_dir),
|
||||
] + rebase_path(sources_to_verify, root_build_dir)
|
||||
|
||||
deps = [
|
||||
"//remoting/webapp:html",
|
||||
] # Generates main.html.
|
||||
}
|
||||
} # if false
|
||||
|
||||
grit("strings") {
|
||||
@ -159,9 +162,9 @@ grit("strings") {
|
||||
|
||||
# The grd produces a *.pak file and a messages.json file (this one uses
|
||||
# underscores instead of hyphens) for each locale.
|
||||
outputs += process_file_template(
|
||||
remoting_locales,
|
||||
[ "remoting/resources/{{source_name_part}}.pak" ])
|
||||
outputs +=
|
||||
process_file_template(remoting_locales,
|
||||
[ "remoting/resources/{{source_name_part}}.pak" ])
|
||||
|
||||
messages_locales = remoting_locales_with_underscores
|
||||
if (!is_chromeos) {
|
||||
@ -171,8 +174,8 @@ grit("strings") {
|
||||
messages_locales += [ "en_US" ]
|
||||
}
|
||||
outputs += process_file_template(
|
||||
messages_locales,
|
||||
[ "remoting/webapp/_locales/{{source_name_part}}/messages.json" ])
|
||||
messages_locales,
|
||||
[ "remoting/webapp/_locales/{{source_name_part}}/messages.json" ])
|
||||
}
|
||||
|
||||
action("copy_locales") {
|
||||
@ -182,28 +185,32 @@ action("copy_locales") {
|
||||
# replacement over the locales. Here, we can do this in GN script by
|
||||
# pretending the locale list is a list of files. The {{source_name_part}}
|
||||
# will just expand to the locale name.
|
||||
inputs = process_file_template(
|
||||
remoting_locales,
|
||||
[ "$target_gen_dir/{{source_name_part}}.pak" ])
|
||||
inputs = process_file_template(remoting_locales,
|
||||
[ "$target_gen_dir/{{source_name_part}}.pak" ])
|
||||
|
||||
# Likewise, process the outputs in the same way as the inputs.
|
||||
if (is_mac || is_ios) {
|
||||
# On mac, use underscores instead of hyphens and put the files in a
|
||||
# different place.
|
||||
outputs = process_file_template(
|
||||
remoting_locales_with_underscores,
|
||||
[ "$root_build_dir/remoting/resources/{{source_name_part}}.lproj/locale.pak" ])
|
||||
remoting_locales_with_underscores,
|
||||
[ "$root_build_dir/remoting/resources/{{source_name_part}}.lproj/locale.pak" ])
|
||||
} else {
|
||||
outputs = process_file_template(
|
||||
remoting_locales,
|
||||
[ "$root_build_dir/remoting_locales/{{source_name_part}}.pak" ])
|
||||
remoting_locales,
|
||||
[ "$root_build_dir/remoting_locales/{{source_name_part}}.pak" ])
|
||||
}
|
||||
|
||||
args = [
|
||||
"-p", os,
|
||||
"-g", rebase_path(root_gen_dir, root_build_dir),
|
||||
"-x", rebase_path(root_out_dir, root_build_dir),
|
||||
] + remoting_locales
|
||||
"-p",
|
||||
os,
|
||||
"-g",
|
||||
rebase_path(root_gen_dir, root_build_dir),
|
||||
"-x",
|
||||
rebase_path(root_out_dir, root_build_dir),
|
||||
] + remoting_locales
|
||||
|
||||
deps = [ ":strings" ]
|
||||
deps = [
|
||||
":strings",
|
||||
]
|
||||
}
|
||||
|
||||
@ -37,6 +37,7 @@ action("html") {
|
||||
"error.js",
|
||||
"event_handlers.js",
|
||||
"plugin_settings.js",
|
||||
|
||||
# TODO(garykac) Split out UI client stuff from remoting.js.
|
||||
"remoting.js",
|
||||
"typecheck.js",
|
||||
@ -59,6 +60,7 @@ action("html") {
|
||||
# Client JavaScript files.
|
||||
remoting_webapp_js_client_files = [
|
||||
"client_plugin.js",
|
||||
|
||||
# TODO(garykac) For client_screen:
|
||||
# * Split out pin/access code stuff into separate file.
|
||||
# * Move client logic into session_connector
|
||||
@ -73,13 +75,10 @@ action("html") {
|
||||
]
|
||||
|
||||
# gnubby authentication JavaScript files.
|
||||
remoting_webapp_js_gnubby_auth_files = [
|
||||
"gnubby_auth_handler.js",
|
||||
]
|
||||
remoting_webapp_js_gnubby_auth_files = [ "gnubby_auth_handler.js" ]
|
||||
|
||||
# cast extension handler JavaScript files.
|
||||
remoting_webapp_js_cast_extension_files = [
|
||||
"cast_extension_handler.js",
|
||||
]
|
||||
remoting_webapp_js_cast_extension_files = [ "cast_extension_handler.js" ]
|
||||
|
||||
# Host JavaScript files.
|
||||
# Includes both it2me and me2me files.
|
||||
@ -132,9 +131,7 @@ action("html") {
|
||||
]
|
||||
|
||||
# Remoting WCS container JavaScript files.
|
||||
remoting_webapp_js_wcs_container_files = [
|
||||
"wcs_sandbox_container.js",
|
||||
]
|
||||
remoting_webapp_js_wcs_container_files = [ "wcs_sandbox_container.js" ]
|
||||
|
||||
# Browser test JavaScript files (uncomment if used below).
|
||||
#remoting_webapp_js_browser_test_files = [
|
||||
@ -151,23 +148,20 @@ action("html") {
|
||||
# Otherwise, Jscompile will complain.
|
||||
remoting_webapp_js_core_files +
|
||||
remoting_webapp_js_auth_client2host_files +
|
||||
remoting_webapp_js_auth_google_files +
|
||||
remoting_webapp_js_client_files +
|
||||
remoting_webapp_js_auth_google_files + remoting_webapp_js_client_files +
|
||||
remoting_webapp_js_gnubby_auth_files +
|
||||
remoting_webapp_js_cast_extension_files +
|
||||
remoting_webapp_js_host_files +
|
||||
remoting_webapp_js_logging_files +
|
||||
remoting_webapp_js_ui_files +
|
||||
remoting_webapp_js_cast_extension_files + remoting_webapp_js_host_files +
|
||||
remoting_webapp_js_logging_files + remoting_webapp_js_ui_files +
|
||||
remoting_webapp_js_ui_host_control_files +
|
||||
remoting_webapp_js_ui_host_display_files +
|
||||
remoting_webapp_js_wcs_container_files
|
||||
# Uncomment this line to include browser test files in the web app
|
||||
# to expedite debugging or local development.
|
||||
#+ remoting_webapp_js_browser_test_files
|
||||
|
||||
inputs = [ remoting_webapp_template_main ] +
|
||||
remoting_webapp_template_files +
|
||||
remoting_webapp_main_html_js_files
|
||||
# Uncomment this line to include browser test files in the web app
|
||||
# to expedite debugging or local development.
|
||||
#+ remoting_webapp_js_browser_test_files
|
||||
|
||||
inputs = [ remoting_webapp_template_main ] + remoting_webapp_template_files +
|
||||
remoting_webapp_main_html_js_files
|
||||
|
||||
outputs = [
|
||||
"$root_gen_dir/main.html",
|
||||
@ -186,11 +180,12 @@ action("html") {
|
||||
rebase_path(remoting_webapp_template_main, template_rel_dir),
|
||||
]
|
||||
args += [ "--template" ] +
|
||||
rebase_path(remoting_webapp_template_files, template_rel_dir)
|
||||
rebase_path(remoting_webapp_template_files, template_rel_dir)
|
||||
args += [ "--js" ] +
|
||||
rebase_path(remoting_webapp_main_html_js_files, template_rel_dir)
|
||||
args += [ "--dir-for-templates",
|
||||
rebase_path(template_rel_dir, root_build_dir) ]
|
||||
rebase_path(remoting_webapp_main_html_js_files, template_rel_dir)
|
||||
args += [
|
||||
"--dir-for-templates",
|
||||
rebase_path(template_rel_dir, root_build_dir),
|
||||
]
|
||||
}
|
||||
|
||||
# TODO(GYP) wcs_sandbox.html
|
||||
|
||||
@ -5,13 +5,19 @@
|
||||
# Meta-target that forwards to the proper platform one.
|
||||
group("sandbox") {
|
||||
if (is_win) {
|
||||
deps = [ "//sandbox/win:sandbox" ]
|
||||
deps = [
|
||||
"//sandbox/win:sandbox",
|
||||
]
|
||||
} else if (is_mac) {
|
||||
# TODO(GYP): Make sandbox compile w/ 10.6 SDK.
|
||||
if (false) {
|
||||
deps = [ "//sandbox/mac:sandbox" ]
|
||||
deps = [
|
||||
"//sandbox/mac:sandbox",
|
||||
]
|
||||
}
|
||||
} else if (is_linux || is_android) {
|
||||
deps = [ "//sandbox/linux:sandbox" ]
|
||||
deps = [
|
||||
"//sandbox/linux:sandbox",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ declare_args() {
|
||||
compile_credentials = is_linux
|
||||
|
||||
compile_seccomp_bpf_demo =
|
||||
(is_linux && (cpu_arch == "x86" || cpu_arch == "x64"))
|
||||
is_linux && (cpu_arch == "x86" || cpu_arch == "x64")
|
||||
}
|
||||
|
||||
# We have two principal targets: sandbox and sandbox_linux_unittests
|
||||
@ -58,9 +58,7 @@ source_set("sandbox_linux_test_utils") {
|
||||
"seccomp-bpf/sandbox_bpf_test_runner.cc",
|
||||
"seccomp-bpf/sandbox_bpf_test_runner.h",
|
||||
]
|
||||
deps += [
|
||||
":seccomp_bpf",
|
||||
]
|
||||
deps += [ ":seccomp_bpf" ]
|
||||
}
|
||||
}
|
||||
|
||||
@ -95,9 +93,7 @@ test("sandbox_linux_unittests") {
|
||||
}
|
||||
|
||||
if (compile_suid_client) {
|
||||
sources += [
|
||||
"suid/client/setuid_sandbox_client_unittest.cc",
|
||||
]
|
||||
sources += [ "suid/client/setuid_sandbox_client_unittest.cc" ]
|
||||
}
|
||||
if (use_seccomp_bpf) {
|
||||
sources += [
|
||||
@ -202,7 +198,7 @@ component("seccomp_bpf_helpers") {
|
||||
}
|
||||
|
||||
if (is_linux) {
|
||||
# The setuid sandbox for Linux.
|
||||
# The setuid sandbox for Linux.
|
||||
executable("chrome_sandbox") {
|
||||
sources = [
|
||||
"suid/common/sandbox.h",
|
||||
@ -215,6 +211,7 @@ if (is_linux) {
|
||||
cflags = [
|
||||
# For ULLONG_MAX
|
||||
"-std=gnu99",
|
||||
|
||||
# These files have a suspicious comparison.
|
||||
# TODO fix this and re-enable this warning.
|
||||
"-Wno-sign-compare",
|
||||
@ -258,6 +255,7 @@ component("sandbox_services") {
|
||||
"services/proc_util.cc",
|
||||
"services/proc_util.h",
|
||||
]
|
||||
|
||||
# For capabilities.cc.
|
||||
configs += [ "//build/config/linux:libcap" ]
|
||||
}
|
||||
@ -329,7 +327,6 @@ if (is_android) {
|
||||
# ":sandbox_linux_unittests",
|
||||
# ]
|
||||
#}
|
||||
|
||||
# TODO(GYP) convert this.
|
||||
# {
|
||||
# 'target_name': 'sandbox_linux_jni_unittests_apk',
|
||||
|
||||
@ -50,20 +50,32 @@ generate_stubs_output_stem = "xpc_stubs"
|
||||
|
||||
action("generate_stubs") {
|
||||
script = generate_stubs_script
|
||||
sources = [ generate_stubs_sig_public, generate_stubs_sig_private ]
|
||||
inputs = [ generate_stubs_header ]
|
||||
sources = [
|
||||
generate_stubs_sig_public,
|
||||
generate_stubs_sig_private,
|
||||
]
|
||||
inputs = [
|
||||
generate_stubs_header,
|
||||
]
|
||||
outputs = [
|
||||
"$target_gen_dir/$generate_stubs_output_stem.cc",
|
||||
"$target_gen_dir/$generate_stubs_output_stem.h",
|
||||
]
|
||||
args = [
|
||||
"-i", rebase_path(target_gen_dir, root_build_dir),
|
||||
"-o", rebase_path(target_gen_dir, root_build_dir),
|
||||
"-t", "posix_stubs",
|
||||
"-e", rebase_path(generate_stubs_header, root_build_dir),
|
||||
"-s", generate_stubs_output_stem,
|
||||
"-p", generate_stubs_project,
|
||||
"-x", "SANDBOX_EXPORT",
|
||||
"-i",
|
||||
rebase_path(target_gen_dir, root_build_dir),
|
||||
"-o",
|
||||
rebase_path(target_gen_dir, root_build_dir),
|
||||
"-t",
|
||||
"posix_stubs",
|
||||
"-e",
|
||||
rebase_path(generate_stubs_header, root_build_dir),
|
||||
"-s",
|
||||
generate_stubs_output_stem,
|
||||
"-p",
|
||||
generate_stubs_project,
|
||||
"-x",
|
||||
"SANDBOX_EXPORT",
|
||||
]
|
||||
args += rebase_path(sources, root_build_dir)
|
||||
}
|
||||
|
||||
@ -127,7 +127,7 @@ source_set("sandbox") {
|
||||
"src/window.h",
|
||||
]
|
||||
|
||||
if (cpu_arch == "x64" ){
|
||||
if (cpu_arch == "x64") {
|
||||
sources += [
|
||||
"src/interceptors_64.cc",
|
||||
"src/interceptors_64.h",
|
||||
@ -169,7 +169,9 @@ if (cpu_arch == "x86") {
|
||||
"wow_helper/wow_helper.exe",
|
||||
"wow_helper/wow_helper.pdb",
|
||||
]
|
||||
outputs = [ "$root_out_dir/{{source_file_part}}" ]
|
||||
outputs = [
|
||||
"$root_out_dir/{{source_file_part}}",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -82,10 +82,14 @@ static_library("sdch") {
|
||||
# logging.h from being used).
|
||||
if (is_win) {
|
||||
cflags = [
|
||||
"/FI", "sdch/logging_forward.h",
|
||||
"/FI",
|
||||
"sdch/logging_forward.h",
|
||||
]
|
||||
} else {
|
||||
logging_file = rebase_path("logging_forward.h", root_build_dir)
|
||||
cflags = [ "-include", logging_file ]
|
||||
cflags = [
|
||||
"-include",
|
||||
logging_file,
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
284
skia/BUILD.gn
284
skia/BUILD.gn
@ -12,76 +12,94 @@ skia_support_gpu = !is_ios
|
||||
skia_support_pdf = !is_ios && (enable_basic_printing || enable_print_preview)
|
||||
|
||||
# The list of Skia defines that are to be set for blink.
|
||||
gypi_blink_skia_defines = exec_script(
|
||||
"//build/gypi_to_gn.py",
|
||||
[ rebase_path("//third_party/WebKit/public/blink_skia_config.gypi"),
|
||||
"--replace=<(skia_include_path)=//third_party/skia/include",
|
||||
"--replace=<(skia_src_path)=//third_party/skia/src" ],
|
||||
"scope",
|
||||
[ "//third_party/WebKit/public/blink_skia_config.gypi" ])
|
||||
gypi_blink_skia_defines =
|
||||
exec_script("//build/gypi_to_gn.py",
|
||||
[
|
||||
rebase_path(
|
||||
"//third_party/WebKit/public/blink_skia_config.gypi"),
|
||||
"--replace=<(skia_include_path)=//third_party/skia/include",
|
||||
"--replace=<(skia_src_path)=//third_party/skia/src",
|
||||
],
|
||||
"scope",
|
||||
[ "//third_party/WebKit/public/blink_skia_config.gypi" ])
|
||||
|
||||
# The list of Skia defines that are to be set for chromium.
|
||||
gypi_skia_defines = exec_script(
|
||||
"//build/gypi_to_gn.py",
|
||||
[ rebase_path("//third_party/skia/gyp/skia_for_chromium_defines.gypi"),
|
||||
"--replace=<(skia_include_path)=//third_party/skia/include",
|
||||
"--replace=<(skia_src_path)=//third_party/skia/src" ],
|
||||
"scope",
|
||||
[ "//third_party/skia/gyp/skia_for_chromium_defines.gypi" ])
|
||||
gypi_skia_defines =
|
||||
exec_script("//build/gypi_to_gn.py",
|
||||
[
|
||||
rebase_path(
|
||||
"//third_party/skia/gyp/skia_for_chromium_defines.gypi"),
|
||||
"--replace=<(skia_include_path)=//third_party/skia/include",
|
||||
"--replace=<(skia_src_path)=//third_party/skia/src",
|
||||
],
|
||||
"scope",
|
||||
[ "//third_party/skia/gyp/skia_for_chromium_defines.gypi" ])
|
||||
|
||||
# The list of Skia core sources that are to be set for chromium.
|
||||
gypi_skia_core = exec_script(
|
||||
"//build/gypi_to_gn.py",
|
||||
[ rebase_path("//third_party/skia/gyp/core.gypi"),
|
||||
"--replace=<(skia_include_path)=//third_party/skia/include",
|
||||
"--replace=<(skia_src_path)=//third_party/skia/src" ],
|
||||
"scope",
|
||||
[ "//third_party/skia/gyp/core.gypi" ])
|
||||
gypi_skia_core =
|
||||
exec_script("//build/gypi_to_gn.py",
|
||||
[
|
||||
rebase_path("//third_party/skia/gyp/core.gypi"),
|
||||
"--replace=<(skia_include_path)=//third_party/skia/include",
|
||||
"--replace=<(skia_src_path)=//third_party/skia/src",
|
||||
],
|
||||
"scope",
|
||||
[ "//third_party/skia/gyp/core.gypi" ])
|
||||
|
||||
# The list of Skia gpu sources that are to be set for chromium.
|
||||
gypi_skia_gpu = exec_script(
|
||||
"//build/gypi_to_gn.py",
|
||||
[ rebase_path("//third_party/skia/gyp/gpu.gypi"),
|
||||
"--replace=<(skia_include_path)=//third_party/skia/include",
|
||||
"--replace=<(skia_src_path)=//third_party/skia/src" ],
|
||||
"scope",
|
||||
[ "//third_party/skia/gyp/gpu.gypi" ])
|
||||
gypi_skia_gpu =
|
||||
exec_script("//build/gypi_to_gn.py",
|
||||
[
|
||||
rebase_path("//third_party/skia/gyp/gpu.gypi"),
|
||||
"--replace=<(skia_include_path)=//third_party/skia/include",
|
||||
"--replace=<(skia_src_path)=//third_party/skia/src",
|
||||
],
|
||||
"scope",
|
||||
[ "//third_party/skia/gyp/gpu.gypi" ])
|
||||
|
||||
# The list of Skia pdf sources that are to be set for chromium.
|
||||
gypi_skia_pdf = exec_script(
|
||||
"//build/gypi_to_gn.py",
|
||||
[ rebase_path("//third_party/skia/gyp/pdf.gypi"),
|
||||
"--replace=<(skia_include_path)=//third_party/skia/include",
|
||||
"--replace=<(skia_src_path)=//third_party/skia/src" ],
|
||||
"scope",
|
||||
[ "//third_party/skia/gyp/pdf.gypi" ])
|
||||
gypi_skia_pdf =
|
||||
exec_script("//build/gypi_to_gn.py",
|
||||
[
|
||||
rebase_path("//third_party/skia/gyp/pdf.gypi"),
|
||||
"--replace=<(skia_include_path)=//third_party/skia/include",
|
||||
"--replace=<(skia_src_path)=//third_party/skia/src",
|
||||
],
|
||||
"scope",
|
||||
[ "//third_party/skia/gyp/pdf.gypi" ])
|
||||
|
||||
# The list of Skia effects that are to be set for chromium.
|
||||
gypi_skia_effects = exec_script(
|
||||
"//build/gypi_to_gn.py",
|
||||
[ rebase_path("//third_party/skia/gyp/effects.gypi"),
|
||||
"--replace=<(skia_include_path)=//third_party/skia/include",
|
||||
"--replace=<(skia_src_path)=//third_party/skia/src" ],
|
||||
"scope",
|
||||
[ "//third_party/skia/gyp/effects.gypi" ])
|
||||
gypi_skia_effects =
|
||||
exec_script("//build/gypi_to_gn.py",
|
||||
[
|
||||
rebase_path("//third_party/skia/gyp/effects.gypi"),
|
||||
"--replace=<(skia_include_path)=//third_party/skia/include",
|
||||
"--replace=<(skia_src_path)=//third_party/skia/src",
|
||||
],
|
||||
"scope",
|
||||
[ "//third_party/skia/gyp/effects.gypi" ])
|
||||
|
||||
# The list of Skia utilss that are to be set for chromium.
|
||||
gypi_skia_utils = exec_script(
|
||||
"//build/gypi_to_gn.py",
|
||||
[ rebase_path("//third_party/skia/gyp/utils.gypi"),
|
||||
"--replace=<(skia_include_path)=//third_party/skia/include",
|
||||
"--replace=<(skia_src_path)=//third_party/skia/src" ],
|
||||
"scope",
|
||||
[ "//third_party/skia/gyp/utils.gypi" ])
|
||||
gypi_skia_utils =
|
||||
exec_script("//build/gypi_to_gn.py",
|
||||
[
|
||||
rebase_path("//third_party/skia/gyp/utils.gypi"),
|
||||
"--replace=<(skia_include_path)=//third_party/skia/include",
|
||||
"--replace=<(skia_src_path)=//third_party/skia/src",
|
||||
],
|
||||
"scope",
|
||||
[ "//third_party/skia/gyp/utils.gypi" ])
|
||||
|
||||
# The list of Skia files is kept in skia_gn_files.gypi. Read it.
|
||||
gypi_values = exec_script(
|
||||
"//build/gypi_to_gn.py",
|
||||
[ rebase_path("skia_gn_files.gypi"),
|
||||
"--replace=<(skia_include_path)=//third_party/skia/include",
|
||||
"--replace=<(skia_src_path)=//third_party/skia/src" ],
|
||||
"scope",
|
||||
[ "skia_gn_files.gypi" ])
|
||||
gypi_values =
|
||||
exec_script("//build/gypi_to_gn.py",
|
||||
[
|
||||
rebase_path("skia_gn_files.gypi"),
|
||||
"--replace=<(skia_include_path)=//third_party/skia/include",
|
||||
"--replace=<(skia_src_path)=//third_party/skia/src",
|
||||
],
|
||||
"scope",
|
||||
[ "skia_gn_files.gypi" ])
|
||||
|
||||
# External-facing config for dependent code.
|
||||
config("skia_config") {
|
||||
@ -178,14 +196,11 @@ config("skia_library_config") {
|
||||
# Forcing the unoptimized path for the offset image filter in skia until
|
||||
# all filters used in Blink support the optimized path properly
|
||||
"SK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION",
|
||||
|
||||
"IGNORE_ROT_AA_RECT_OPT",
|
||||
|
||||
"SK_IGNORE_BLURRED_RRECT_OPT",
|
||||
|
||||
# this flag forces Skia not to use typographic metrics with GDI.
|
||||
"SK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS",
|
||||
|
||||
"SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
|
||||
]
|
||||
|
||||
@ -234,7 +249,7 @@ config("skia_library_config") {
|
||||
# Android devices are typically more memory constrained, so default to a
|
||||
# smaller glyph cache (it may be overriden at runtime when the renderer
|
||||
# starts up, depending on the actual device memory).
|
||||
"SK_DEFAULT_FONT_CACHE_LIMIT=1048576" # 1024 * 1024
|
||||
"SK_DEFAULT_FONT_CACHE_LIMIT=1048576", # 1024 * 1024
|
||||
]
|
||||
} else {
|
||||
defines += [ "SK_DEFAULT_FONT_CACHE_LIMIT=20971520" ] # 20 * 1024 * 1024
|
||||
@ -249,15 +264,15 @@ config("skia_library_config") {
|
||||
defines += [ "SK_FONTHOST_USES_FONTMGR" ]
|
||||
|
||||
cflags = [
|
||||
"/wd4244", # conversion from 'type1( __int64)' to 'type2 (unsigned int)'
|
||||
"/wd4267", # conversion from 'size_t' (64 bit) to 'type'(32 bit).
|
||||
"/wd4341", # signed value is out of range for enum constant.
|
||||
"/wd4345", # Object is default-initialized if initialization is omitted.
|
||||
"/wd4390", # ';'empty statement found in looping;is it what was intended?
|
||||
"/wd4554", # 'operator' : check operator precedence for possible error
|
||||
"/wd4748", # compiler will disable optimizations if a function has inline
|
||||
# assembly code contains flow control(jmp or jcc) statements.
|
||||
"/wd4800", # forcing value to bool 'true/false'(assigning int to bool).
|
||||
"/wd4244", # conversion from 'type1( __int64)' to 'type2 (unsigned int)'
|
||||
"/wd4267", # conversion from 'size_t' (64 bit) to 'type'(32 bit).
|
||||
"/wd4341", # signed value is out of range for enum constant.
|
||||
"/wd4345", # Object is default-initialized if initialization is omitted.
|
||||
"/wd4390", # ';'empty statement found in looping;is it what was intended?
|
||||
"/wd4554", # 'operator' : check operator precedence for possible error
|
||||
"/wd4748", # compiler will disable optimizations if a function has inline
|
||||
# assembly code contains flow control(jmp or jcc) statements.
|
||||
"/wd4800", # forcing value to bool 'true/false'(assigning int to bool).
|
||||
]
|
||||
}
|
||||
}
|
||||
@ -334,59 +349,58 @@ component("skia") {
|
||||
|
||||
# Remove unused util files include in utils.gypi
|
||||
sources -= [
|
||||
"//third_party/skia/include/utils/SkBoundaryPatch.h",
|
||||
"//third_party/skia/include/utils/SkFrontBufferedStream.h",
|
||||
"//third_party/skia/include/utils/SkCamera.h",
|
||||
"//third_party/skia/include/utils/SkCanvasStateUtils.h",
|
||||
"//third_party/skia/include/utils/SkCubicInterval.h",
|
||||
"//third_party/skia/include/utils/SkCullPoints.h",
|
||||
"//third_party/skia/include/utils/SkDebugUtils.h",
|
||||
"//third_party/skia/include/utils/SkDumpCanvas.h",
|
||||
"//third_party/skia/include/utils/SkEventTracer.h",
|
||||
"//third_party/skia/include/utils/SkInterpolator.h",
|
||||
"//third_party/skia/include/utils/SkLayer.h",
|
||||
"//third_party/skia/include/utils/SkMeshUtils.h",
|
||||
"//third_party/skia/include/utils/SkNinePatch.h",
|
||||
"//third_party/skia/include/utils/SkParse.h",
|
||||
"//third_party/skia/include/utils/SkParsePaint.h",
|
||||
"//third_party/skia/include/utils/SkParsePath.h",
|
||||
"//third_party/skia/include/utils/SkRandom.h",
|
||||
"//third_party/skia/include/utils/SkBoundaryPatch.h",
|
||||
"//third_party/skia/include/utils/SkFrontBufferedStream.h",
|
||||
"//third_party/skia/include/utils/SkCamera.h",
|
||||
"//third_party/skia/include/utils/SkCanvasStateUtils.h",
|
||||
"//third_party/skia/include/utils/SkCubicInterval.h",
|
||||
"//third_party/skia/include/utils/SkCullPoints.h",
|
||||
"//third_party/skia/include/utils/SkDebugUtils.h",
|
||||
"//third_party/skia/include/utils/SkDumpCanvas.h",
|
||||
"//third_party/skia/include/utils/SkEventTracer.h",
|
||||
"//third_party/skia/include/utils/SkInterpolator.h",
|
||||
"//third_party/skia/include/utils/SkLayer.h",
|
||||
"//third_party/skia/include/utils/SkMeshUtils.h",
|
||||
"//third_party/skia/include/utils/SkNinePatch.h",
|
||||
"//third_party/skia/include/utils/SkParse.h",
|
||||
"//third_party/skia/include/utils/SkParsePaint.h",
|
||||
"//third_party/skia/include/utils/SkParsePath.h",
|
||||
"//third_party/skia/include/utils/SkRandom.h",
|
||||
"//third_party/skia/src/utils/SkBitmapHasher.cpp",
|
||||
"//third_party/skia/src/utils/SkBitmapHasher.h",
|
||||
"//third_party/skia/src/utils/SkBoundaryPatch.cpp",
|
||||
"//third_party/skia/src/utils/SkFrontBufferedStream.cpp",
|
||||
"//third_party/skia/src/utils/SkCamera.cpp",
|
||||
"//third_party/skia/src/utils/SkCanvasStack.h",
|
||||
"//third_party/skia/src/utils/SkCubicInterval.cpp",
|
||||
"//third_party/skia/src/utils/SkCullPoints.cpp",
|
||||
"//third_party/skia/src/utils/SkDumpCanvas.cpp",
|
||||
"//third_party/skia/src/utils/SkFloatUtils.h",
|
||||
"//third_party/skia/src/utils/SkGatherPixelRefsAndRects.cpp",
|
||||
"//third_party/skia/src/utils/SkGatherPixelRefsAndRects.h",
|
||||
"//third_party/skia/src/utils/SkInterpolator.cpp",
|
||||
"//third_party/skia/src/utils/SkLayer.cpp",
|
||||
"//third_party/skia/src/utils/SkMD5.cpp",
|
||||
"//third_party/skia/src/utils/SkMD5.h",
|
||||
"//third_party/skia/src/utils/SkMeshUtils.cpp",
|
||||
"//third_party/skia/src/utils/SkNinePatch.cpp",
|
||||
"//third_party/skia/src/utils/SkOSFile.cpp",
|
||||
"//third_party/skia/src/utils/SkParse.cpp",
|
||||
"//third_party/skia/src/utils/SkParseColor.cpp",
|
||||
"//third_party/skia/src/utils/SkParsePath.cpp",
|
||||
"//third_party/skia/src/utils/SkPathUtils.cpp",
|
||||
"//third_party/skia/src/utils/SkSHA1.cpp",
|
||||
"//third_party/skia/src/utils/SkSHA1.h",
|
||||
"//third_party/skia/src/utils/SkTFitsIn.h",
|
||||
"//third_party/skia/src/utils/SkTLogic.h",
|
||||
|
||||
"//third_party/skia/src/utils/SkBitmapHasher.cpp",
|
||||
"//third_party/skia/src/utils/SkBitmapHasher.h",
|
||||
"//third_party/skia/src/utils/SkBoundaryPatch.cpp",
|
||||
"//third_party/skia/src/utils/SkFrontBufferedStream.cpp",
|
||||
"//third_party/skia/src/utils/SkCamera.cpp",
|
||||
"//third_party/skia/src/utils/SkCanvasStack.h",
|
||||
"//third_party/skia/src/utils/SkCubicInterval.cpp",
|
||||
"//third_party/skia/src/utils/SkCullPoints.cpp",
|
||||
"//third_party/skia/src/utils/SkDumpCanvas.cpp",
|
||||
"//third_party/skia/src/utils/SkFloatUtils.h",
|
||||
"//third_party/skia/src/utils/SkGatherPixelRefsAndRects.cpp",
|
||||
"//third_party/skia/src/utils/SkGatherPixelRefsAndRects.h",
|
||||
"//third_party/skia/src/utils/SkInterpolator.cpp",
|
||||
"//third_party/skia/src/utils/SkLayer.cpp",
|
||||
"//third_party/skia/src/utils/SkMD5.cpp",
|
||||
"//third_party/skia/src/utils/SkMD5.h",
|
||||
"//third_party/skia/src/utils/SkMeshUtils.cpp",
|
||||
"//third_party/skia/src/utils/SkNinePatch.cpp",
|
||||
"//third_party/skia/src/utils/SkOSFile.cpp",
|
||||
"//third_party/skia/src/utils/SkParse.cpp",
|
||||
"//third_party/skia/src/utils/SkParseColor.cpp",
|
||||
"//third_party/skia/src/utils/SkParsePath.cpp",
|
||||
"//third_party/skia/src/utils/SkPathUtils.cpp",
|
||||
"//third_party/skia/src/utils/SkSHA1.cpp",
|
||||
"//third_party/skia/src/utils/SkSHA1.h",
|
||||
"//third_party/skia/src/utils/SkTFitsIn.h",
|
||||
"//third_party/skia/src/utils/SkTLogic.h",
|
||||
# We don't currently need to change thread affinity, so leave out this complexity for now.
|
||||
"//third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp",
|
||||
"//third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp",
|
||||
|
||||
# We don't currently need to change thread affinity, so leave out this complexity for now.
|
||||
"//third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp",
|
||||
"//third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp",
|
||||
|
||||
#testing
|
||||
"//third_party/skia/src/fonts/SkGScalerContext.cpp",
|
||||
"//third_party/skia/src/fonts/SkGScalerContext.h",
|
||||
#testing
|
||||
"//third_party/skia/src/fonts/SkGScalerContext.cpp",
|
||||
"//third_party/skia/src/fonts/SkGScalerContext.h",
|
||||
]
|
||||
|
||||
if (is_win) {
|
||||
@ -425,9 +439,7 @@ component("skia") {
|
||||
sources -= [ "ext/SkThread_chrome.cc" ]
|
||||
}
|
||||
if (is_android && (!enable_basic_printing && !enable_print_preview)) {
|
||||
sources -= [
|
||||
"ext/skia_utils_base.cc",
|
||||
]
|
||||
sources -= [ "ext/skia_utils_base.cc" ]
|
||||
}
|
||||
|
||||
# Fixup skia library sources.
|
||||
@ -457,9 +469,7 @@ component("skia") {
|
||||
]
|
||||
}
|
||||
if (!is_mac) {
|
||||
sources -= [
|
||||
"//third_party/skia/src/ports/SkFontHost_mac.cpp",
|
||||
]
|
||||
sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ]
|
||||
}
|
||||
|
||||
if (!is_linux) {
|
||||
@ -510,7 +520,7 @@ component("skia") {
|
||||
configs -= [ "//build/config/compiler:chromium_code" ]
|
||||
configs += [
|
||||
":skia_library_config",
|
||||
"//build/config/compiler:no_chromium_code"
|
||||
"//build/config/compiler:no_chromium_code",
|
||||
]
|
||||
public_configs = [ ":skia_config" ]
|
||||
|
||||
@ -535,16 +545,12 @@ component("skia") {
|
||||
"//build/config/linux:freetype2",
|
||||
"//build/config/linux:pangocairo",
|
||||
]
|
||||
deps += [
|
||||
"//third_party/icu:icuuc",
|
||||
]
|
||||
deps += [ "//third_party/icu:icuuc" ]
|
||||
}
|
||||
|
||||
if (is_android) {
|
||||
set_sources_assignment_filter([])
|
||||
sources += [
|
||||
"ext/platform_device_linux.cc",
|
||||
]
|
||||
sources += [ "ext/platform_device_linux.cc" ]
|
||||
set_sources_assignment_filter(sources_assignment_filter)
|
||||
deps += [
|
||||
"//third_party/expat",
|
||||
@ -603,9 +609,8 @@ source_set("skia_opts") {
|
||||
if (cpu_arch == "x86") {
|
||||
sources += [ "//third_party/skia/src/opts/SkBlitRow_opts_SSE4_asm.S" ]
|
||||
} else { # x64
|
||||
sources += [
|
||||
"//third_party/skia/src/opts/SkBlitRow_opts_SSE4_x64_asm.S"
|
||||
]
|
||||
sources +=
|
||||
[ "//third_party/skia/src/opts/SkBlitRow_opts_SSE4_x64_asm.S" ]
|
||||
}
|
||||
}
|
||||
|
||||
@ -642,9 +647,7 @@ source_set("skia_opts") {
|
||||
# when running this.
|
||||
if (!arm_use_neon) {
|
||||
configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
|
||||
cflags += [
|
||||
"-mfpu=neon"
|
||||
]
|
||||
cflags += [ "-mfpu=neon" ]
|
||||
}
|
||||
|
||||
#ldflags = [
|
||||
@ -682,7 +685,6 @@ source_set("skia_opts") {
|
||||
"//third_party/skia/src/opts/SkXfermode_opts_none.cpp",
|
||||
]
|
||||
}
|
||||
|
||||
} else if (cpu_arch == "mipsel") {
|
||||
cflags += [ "-fomit-frame-pointer" ]
|
||||
sources = [
|
||||
@ -708,7 +710,7 @@ source_set("skia_opts") {
|
||||
configs += [
|
||||
":skia_config",
|
||||
":skia_library_config",
|
||||
"//build/config/compiler:no_chromium_code"
|
||||
"//build/config/compiler:no_chromium_code",
|
||||
]
|
||||
|
||||
deps = [
|
||||
|
||||
@ -414,9 +414,7 @@ source_set("sync_core") {
|
||||
|
||||
if (is_chromeos) {
|
||||
# Required by get_session_name.cc on Chrome OS.
|
||||
deps += [
|
||||
"//chromeos"
|
||||
]
|
||||
deps += [ "//chromeos" ]
|
||||
}
|
||||
|
||||
defines = [ "SYNC_IMPLEMENTATION" ]
|
||||
@ -656,9 +654,7 @@ test("sync_unit_tests") {
|
||||
|
||||
if (is_chromeos) {
|
||||
# Required by get_session_name_unittest.cc on Chrome OS.
|
||||
deps += [
|
||||
"//chromeos"
|
||||
]
|
||||
deps += [ "//chromeos" ]
|
||||
}
|
||||
|
||||
if (is_ios) {
|
||||
@ -727,7 +723,6 @@ static_library("test_support_sync_testserver") {
|
||||
]
|
||||
deps = [
|
||||
":sync",
|
||||
|
||||
# The sync test server uses Python modules generated by the sync protos.
|
||||
# '../third_party/protobuf/protobuf.gyp:py_proto', # TODO(GYP)
|
||||
]
|
||||
@ -766,7 +761,9 @@ if (!is_ios) {
|
||||
# GYP version: sync/sync_tests.gypi:run_sync_testserver
|
||||
executable("run_sync_testserver") {
|
||||
testonly = true
|
||||
sources = [ "tools/testserver/run_sync_testserver.cc" ]
|
||||
sources = [
|
||||
"tools/testserver/run_sync_testserver.cc",
|
||||
]
|
||||
|
||||
deps = [
|
||||
"//base",
|
||||
@ -786,7 +783,7 @@ if (is_android) {
|
||||
testonly = true
|
||||
jni_package = "sync/test/fake_server"
|
||||
sources = [
|
||||
"//chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/FakeServerHelper.java"
|
||||
"//chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/FakeServerHelper.java",
|
||||
]
|
||||
}
|
||||
|
||||
@ -819,7 +816,7 @@ if (is_android) {
|
||||
# GYP: //sync/sync_tests.gypi:sync_unit_tests_apk
|
||||
unittest_apk("sync_unit_tests_apk") {
|
||||
unittests_dep = ":sync_unit_tests"
|
||||
deps = [
|
||||
deps = [
|
||||
":sync_unit_tests",
|
||||
]
|
||||
}
|
||||
|
||||
@ -12,5 +12,4 @@ proto_library("proto") {
|
||||
cc_include = "sync/base/sync_export.h"
|
||||
|
||||
defines = [ "SYNC_IMPLEMENTATION" ]
|
||||
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@ import("//build/config/android/rules.gni")
|
||||
source_set("native_test_native_code") {
|
||||
testonly = true
|
||||
sources = [
|
||||
"native_test_launcher.cc"
|
||||
"native_test_launcher.cc",
|
||||
]
|
||||
libs = [ "log" ]
|
||||
deps = [
|
||||
@ -36,6 +36,6 @@ source_set("native_test_util") {
|
||||
"native_test_util.h",
|
||||
]
|
||||
deps = [
|
||||
"//base"
|
||||
"//base",
|
||||
]
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ import("//build/config/android/rules.gni")
|
||||
java_library("junit_test_support") {
|
||||
DEPRECATED_java_in_dir = "java/src"
|
||||
deps = [
|
||||
"//third_party/junit"
|
||||
"//third_party/junit",
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@ -3,6 +3,10 @@
|
||||
# found in the LICENSE file.
|
||||
|
||||
source_set("perf") {
|
||||
sources = [ "perf_test.cc" ]
|
||||
deps = [ "//base" ]
|
||||
sources = [
|
||||
"perf_test.cc",
|
||||
]
|
||||
deps = [
|
||||
"//base",
|
||||
]
|
||||
}
|
||||
|
||||
8
third_party/adobe/flash/BUILD.gn
vendored
8
third_party/adobe/flash/BUILD.gn
vendored
@ -52,7 +52,9 @@ copy("flapper_version_h") {
|
||||
sources = [
|
||||
flapper_version_h_file,
|
||||
]
|
||||
outputs = [ "$root_gen_dir/{{source_file_part}}" ]
|
||||
outputs = [
|
||||
"$root_gen_dir/{{source_file_part}}",
|
||||
]
|
||||
}
|
||||
|
||||
if (flapper_binary_files == []) {
|
||||
@ -62,6 +64,8 @@ if (flapper_binary_files == []) {
|
||||
} else {
|
||||
copy("flapper_binaries") {
|
||||
sources = flapper_binary_files
|
||||
outputs = [ "$root_out_dir/PepperFlash/{{source_file_part}}" ]
|
||||
outputs = [
|
||||
"$root_out_dir/PepperFlash/{{source_file_part}}",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
9
third_party/cython/rules.gni
vendored
9
third_party/cython/rules.gni
vendored
@ -20,7 +20,9 @@ template("python_binary_module_sources") {
|
||||
visibility = target_visibility
|
||||
script = cython_script
|
||||
sources = invoker.sources
|
||||
outputs = [ cython_output ]
|
||||
outputs = [
|
||||
cython_output,
|
||||
]
|
||||
args = [
|
||||
"--cplus",
|
||||
"-I",
|
||||
@ -115,8 +117,9 @@ template("python_binary_module") {
|
||||
sources = [
|
||||
"$root_out_dir/${shared_library_prefix}${shared_library_name}${shared_library_suffix}",
|
||||
]
|
||||
outputs =
|
||||
[ "$root_out_dir/python/$python_base_module/${target_name}${python_module_suffix}" ]
|
||||
outputs = [
|
||||
"$root_out_dir/python/$python_base_module/${target_name}${python_module_suffix}",
|
||||
]
|
||||
deps = [
|
||||
":$shared_library_name",
|
||||
]
|
||||
|
||||
4
third_party/google_input_tools/closure.gni
vendored
4
third_party/google_input_tools/closure.gni
vendored
@ -9,7 +9,9 @@ template("build_closure") {
|
||||
action(action_name) {
|
||||
script = "//third_party/google_input_tools/builder.py"
|
||||
sources = invoker.sources
|
||||
outputs = [ invoker.target ]
|
||||
outputs = [
|
||||
invoker.target,
|
||||
]
|
||||
args = [
|
||||
"--target",
|
||||
rebase_path(invoker.target, root_build_dir),
|
||||
|
||||
4
third_party/opus/BUILD.gn
vendored
4
third_party/opus/BUILD.gn
vendored
@ -22,7 +22,9 @@ config("opus_config") {
|
||||
if (use_opus_rtcd) {
|
||||
action("convert_rtcd_assembler") {
|
||||
script = "convert_rtcd_assembler.py"
|
||||
outputs = [ "$target_gen_dir/celt_pitch_xcorr_arm_gnu.S" ]
|
||||
outputs = [
|
||||
"$target_gen_dir/celt_pitch_xcorr_arm_gnu.S",
|
||||
]
|
||||
args = [
|
||||
rebase_path("//third_party/opus/src/celt/arm/arm2gnu.pl", root_build_dir),
|
||||
rebase_path("//third_party/opus/src/celt/arm/celt_pitch_xcorr_arm.s",
|
||||
|
||||
4
third_party/stp/BUILD.gn
vendored
4
third_party/stp/BUILD.gn
vendored
@ -368,7 +368,9 @@ action_foreach("generate_lexer") {
|
||||
"src/lib/Parser/smt.lex",
|
||||
"src/lib/Parser/smt2.lex",
|
||||
]
|
||||
outputs = [ "{{source_gen_dir}}/lex{{source_name_part}}.cpp" ]
|
||||
outputs = [
|
||||
"{{source_gen_dir}}/lex{{source_name_part}}.cpp",
|
||||
]
|
||||
args = [
|
||||
"{{source}}",
|
||||
"{{source_name_part}}",
|
||||
|
||||
8
third_party/widevine/cdm/BUILD.gn
vendored
8
third_party/widevine/cdm/BUILD.gn
vendored
@ -48,7 +48,9 @@ copy("version_h") {
|
||||
# TODO(brettw) this should go into target_out_dir and callers should include
|
||||
# it from there. This requires, however, renaming the default
|
||||
# widevine_cdm_version.h in this directory to avoid conflicts.
|
||||
outputs = [ "$root_gen_dir/widevine_cdm_version.h" ]
|
||||
outputs = [
|
||||
"$root_gen_dir/widevine_cdm_version.h",
|
||||
]
|
||||
}
|
||||
|
||||
# GYP version: third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_binaries
|
||||
@ -59,7 +61,9 @@ if (widevine_cdm_binary_files == []) {
|
||||
} else {
|
||||
copy("binaries") {
|
||||
sources = widevine_cdm_binary_files
|
||||
outputs = [ "$root_out_dir/{{source_file_part}}" ]
|
||||
outputs = [
|
||||
"$root_out_dir/{{source_file_part}}",
|
||||
]
|
||||
|
||||
# TODO(GYP)
|
||||
# 'COPY_PHASE_STRIP': 'NO',
|
||||
|
||||
44
third_party/yasm/BUILD.gn
vendored
44
third_party/yasm/BUILD.gn
vendored
@ -285,7 +285,9 @@ if (current_toolchain == host_toolchain) {
|
||||
"source/patched-yasm/modules/arch/x86/x86regtmod.gperf",
|
||||
]
|
||||
|
||||
outputs = [ "$target_gen_dir/{{source_name_part}}.c" ]
|
||||
outputs = [
|
||||
"$target_gen_dir/{{source_name_part}}.c",
|
||||
]
|
||||
args = [
|
||||
"{{source}}",
|
||||
rebase_path(target_gen_dir, root_build_dir) + "/{{source_name_part}}.c",
|
||||
@ -309,7 +311,9 @@ if (current_toolchain == host_toolchain) {
|
||||
"$yasm_gen_include_dir/x86insn_nasm.gperf",
|
||||
]
|
||||
|
||||
outputs = [ "$yasm_gen_include_dir/{{source_name_part}}.c" ]
|
||||
outputs = [
|
||||
"$yasm_gen_include_dir/{{source_name_part}}.c",
|
||||
]
|
||||
args = [
|
||||
"{{source}}",
|
||||
rebase_path(yasm_gen_include_dir, root_build_dir) +
|
||||
@ -344,7 +348,9 @@ if (current_toolchain == host_toolchain) {
|
||||
sources = [
|
||||
"source/patched-yasm/modules/parsers/nasm/nasm-std.mac",
|
||||
]
|
||||
outputs = [ "$yasm_gen_include_dir/nasm-macros.c" ]
|
||||
outputs = [
|
||||
"$yasm_gen_include_dir/nasm-macros.c",
|
||||
]
|
||||
macro_varname = "nasm_standard_mac"
|
||||
}
|
||||
|
||||
@ -354,7 +360,9 @@ if (current_toolchain == host_toolchain) {
|
||||
sources = [
|
||||
"$target_gen_dir/$version_file",
|
||||
]
|
||||
outputs = [ "$yasm_gen_include_dir/nasm-version.c" ]
|
||||
outputs = [
|
||||
"$yasm_gen_include_dir/nasm-version.c",
|
||||
]
|
||||
macro_varname = "nasm_version_mac"
|
||||
deps = [
|
||||
":generate_version",
|
||||
@ -366,7 +374,9 @@ if (current_toolchain == host_toolchain) {
|
||||
sources = [
|
||||
"source/patched-yasm/modules/objfmts/coff/win64-gas.mac",
|
||||
]
|
||||
outputs = [ "$yasm_gen_include_dir/win64-gas.c" ]
|
||||
outputs = [
|
||||
"$yasm_gen_include_dir/win64-gas.c",
|
||||
]
|
||||
macro_varname = "win64_gas_stdmac"
|
||||
}
|
||||
|
||||
@ -375,7 +385,9 @@ if (current_toolchain == host_toolchain) {
|
||||
sources = [
|
||||
"source/patched-yasm/modules/objfmts/coff/win64-nasm.mac",
|
||||
]
|
||||
outputs = [ "$yasm_gen_include_dir/win64-nasm.c" ]
|
||||
outputs = [
|
||||
"$yasm_gen_include_dir/win64-nasm.c",
|
||||
]
|
||||
macro_varname = "win64_nasm_stdmac"
|
||||
}
|
||||
|
||||
@ -385,7 +397,9 @@ if (current_toolchain == host_toolchain) {
|
||||
"source/patched-yasm/modules/parsers/gas/gas-token.re",
|
||||
"source/patched-yasm/modules/parsers/nasm/nasm-token.re",
|
||||
]
|
||||
outputs = [ "$target_gen_dir/{{source_name_part}}.c" ]
|
||||
outputs = [
|
||||
"$target_gen_dir/{{source_name_part}}.c",
|
||||
]
|
||||
args = [
|
||||
"-b",
|
||||
"-o",
|
||||
@ -400,7 +414,9 @@ if (current_toolchain == host_toolchain) {
|
||||
inputs = [
|
||||
"source/patched-yasm/modules/arch/lc3b/lc3bid.re",
|
||||
]
|
||||
outputs = [ "$target_gen_dir/lc3bid.c" ]
|
||||
outputs = [
|
||||
"$target_gen_dir/lc3bid.c",
|
||||
]
|
||||
args = [
|
||||
"-s",
|
||||
"-o",
|
||||
@ -416,7 +432,9 @@ if (current_toolchain == host_toolchain) {
|
||||
inputs = [
|
||||
"source/patched-yasm/COPYING",
|
||||
]
|
||||
outputs = [ "$yasm_gen_include_dir/license.c" ]
|
||||
outputs = [
|
||||
"$yasm_gen_include_dir/license.c",
|
||||
]
|
||||
args = [
|
||||
"license_msg",
|
||||
rebase_path(outputs[0], root_build_dir),
|
||||
@ -430,7 +448,9 @@ if (current_toolchain == host_toolchain) {
|
||||
"source/patched-yasm/libyasm/module.in",
|
||||
config_makefile,
|
||||
]
|
||||
outputs = [ "$target_gen_dir/module.c" ]
|
||||
outputs = [
|
||||
"$target_gen_dir/module.c",
|
||||
]
|
||||
args = [
|
||||
rebase_path(inputs[0], root_build_dir),
|
||||
rebase_path(config_makefile, root_build_dir),
|
||||
@ -440,7 +460,9 @@ if (current_toolchain == host_toolchain) {
|
||||
|
||||
compiled_action("generate_version") {
|
||||
tool = ":genversion"
|
||||
outputs = [ "$target_gen_dir/$version_file" ]
|
||||
outputs = [
|
||||
"$target_gen_dir/$version_file",
|
||||
]
|
||||
args = [ rebase_path(outputs[0], root_build_dir) ]
|
||||
}
|
||||
|
||||
|
||||
4
third_party/yasm/yasm_assemble.gni
vendored
4
third_party/yasm/yasm_assemble.gni
vendored
@ -172,7 +172,9 @@ template("yasm_assemble") {
|
||||
# exactly duplicate the naming and location of object files from the
|
||||
# native build, which would be:
|
||||
# "$root_out_dir/${target_name}.{{source_dir_part}}.$asm_obj_extension"
|
||||
outputs = [ "$target_out_dir/{{source_name_part}}.o" ]
|
||||
outputs = [
|
||||
"$target_out_dir/{{source_name_part}}.o",
|
||||
]
|
||||
args += [
|
||||
"-o",
|
||||
rebase_path(outputs[0], root_build_dir),
|
||||
|
||||
@ -88,7 +88,11 @@ if (current_toolchain != default_toolchain) {
|
||||
|
||||
# GYP: //tools/android/forwarder2/forwarder.gyp:forwarder2
|
||||
copy("host_forwarder_copy") {
|
||||
sources = ["$root_out_dir/host_forwarder"]
|
||||
outputs = ["$root_build_dir/host_forwarder"]
|
||||
sources = [
|
||||
"$root_out_dir/host_forwarder",
|
||||
]
|
||||
outputs = [
|
||||
"$root_build_dir/host_forwarder",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@ -10,6 +10,7 @@ group("md5sum") {
|
||||
":md5sum_prepare_dist($default_toolchain)",
|
||||
":md5sum_copy_host($host_toolchain)",
|
||||
]
|
||||
|
||||
# TODO(cjhopman): Remove once group datadeps are fixed.
|
||||
deps = datadeps
|
||||
}
|
||||
@ -17,10 +18,10 @@ group("md5sum") {
|
||||
# GYP: //tools/android/md5sum/md5sum.gyp:md5sum_bin_device (and md5sum_bin_host)
|
||||
executable("md5sum_bin") {
|
||||
sources = [
|
||||
"md5sum.cc"
|
||||
"md5sum.cc",
|
||||
]
|
||||
deps = [
|
||||
"//base"
|
||||
"//base",
|
||||
]
|
||||
|
||||
# TODO(GYP)
|
||||
@ -43,11 +44,10 @@ if (current_toolchain == default_toolchain) {
|
||||
# GYP: //tools/android/md5sum/md5sum.gyp:md5sum_bin_host
|
||||
copy("md5sum_copy_host") {
|
||||
sources = [
|
||||
"$root_out_dir/md5sum_bin"
|
||||
"$root_out_dir/md5sum_bin",
|
||||
]
|
||||
outputs = [
|
||||
"$root_build_dir/md5sum_bin_host"
|
||||
"$root_build_dir/md5sum_bin_host",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -24,13 +24,21 @@ template("generate_library_loader") {
|
||||
visibility = invoker.visibility
|
||||
}
|
||||
|
||||
outputs = [ output_h, output_cc ]
|
||||
outputs = [
|
||||
output_h,
|
||||
output_cc,
|
||||
]
|
||||
|
||||
args = [
|
||||
"--name", invoker.name,
|
||||
"--output-h", rebase_path(output_h),
|
||||
"--output-cc", rebase_path(output_cc),
|
||||
"--header", invoker.header,
|
||||
"--name",
|
||||
invoker.name,
|
||||
"--output-h",
|
||||
rebase_path(output_h),
|
||||
"--output-cc",
|
||||
rebase_path(output_cc),
|
||||
"--header",
|
||||
invoker.header,
|
||||
|
||||
# Note GYP build exposes a per-target variable to control this, which, if
|
||||
# manually set to true, will disable dlopen(). Its not clear this is
|
||||
# needed, so here we just leave off. If this can be done globally, we can
|
||||
@ -39,7 +47,10 @@ template("generate_library_loader") {
|
||||
"--link-directly=0",
|
||||
]
|
||||
if (defined(invoker.bundled_header)) {
|
||||
args += [ "--bundled-header", invoker.bundled_header ]
|
||||
args += [
|
||||
"--bundled-header",
|
||||
invoker.bundled_header,
|
||||
]
|
||||
}
|
||||
args += invoker.functions
|
||||
}
|
||||
@ -48,7 +59,12 @@ template("generate_library_loader") {
|
||||
if (defined(invoker.config)) {
|
||||
public_configs = [ invoker.config ]
|
||||
}
|
||||
sources = [ output_h, output_cc ]
|
||||
deps = [ ":${target_name}_loader" ]
|
||||
sources = [
|
||||
output_h,
|
||||
output_cc,
|
||||
]
|
||||
deps = [
|
||||
":${target_name}_loader",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@ -188,10 +188,14 @@ action("last_commit_position") {
|
||||
script = "last_commit_position.py"
|
||||
|
||||
# This dependency forces a re-run when the code is synced.
|
||||
inputs = [ "//build/util/LASTCHANGE" ]
|
||||
inputs = [
|
||||
"//build/util/LASTCHANGE",
|
||||
]
|
||||
|
||||
outfile = "$target_gen_dir/last_commit_position.h"
|
||||
outputs = [ outfile ]
|
||||
outputs = [
|
||||
outfile,
|
||||
]
|
||||
|
||||
args = [
|
||||
rebase_path("//", root_build_dir),
|
||||
@ -271,6 +275,10 @@ test("gn_unittests") {
|
||||
}
|
||||
|
||||
executable("generate_test_gn_data") {
|
||||
sources = [ "generate_test_gn_data.cc" ]
|
||||
deps = [ "//base" ]
|
||||
sources = [
|
||||
"generate_test_gn_data.cc",
|
||||
]
|
||||
deps = [
|
||||
"//base",
|
||||
]
|
||||
}
|
||||
|
||||
@ -3,7 +3,9 @@
|
||||
# found in the LICENSE file.
|
||||
|
||||
executable("hello") {
|
||||
sources = [ "hello.cc" ]
|
||||
sources = [
|
||||
"hello.cc",
|
||||
]
|
||||
|
||||
deps = [
|
||||
":hello_static",
|
||||
@ -14,7 +16,7 @@ executable("hello") {
|
||||
shared_library("hello_shared") {
|
||||
sources = [
|
||||
"hello_shared.cc",
|
||||
"hello_shared.h"
|
||||
"hello_shared.h",
|
||||
]
|
||||
|
||||
defines = [ "HELLO_SHARED_IMPLEMENTATION" ]
|
||||
|
||||
@ -3,13 +3,12 @@
|
||||
# found in the LICENSE file.
|
||||
|
||||
# All binary targets will get this list of configs by default.
|
||||
_shared_binary_target_configs = [
|
||||
"//build:compiler_defaults",
|
||||
]
|
||||
_shared_binary_target_configs = [ "//build:compiler_defaults" ]
|
||||
|
||||
# Apply that default list to the binary target types.
|
||||
set_defaults("executable") {
|
||||
configs = _shared_binary_target_configs
|
||||
|
||||
# Executables get this additional configuration.
|
||||
configs += [ "//build:executable_ldconfig" ]
|
||||
}
|
||||
|
||||
@ -29,7 +29,7 @@ toolchain("gcc") {
|
||||
description = "AR {{target_output_name}}{{output_extension}}"
|
||||
rspfile_content = "{{inputs}}"
|
||||
outputs = [
|
||||
"{{target_out_dir}}/{{target_output_name}}{{output_extension}}"
|
||||
"{{target_out_dir}}/{{target_output_name}}{{output_extension}}",
|
||||
]
|
||||
default_output_extension = ".a"
|
||||
output_prefix = "lib"
|
||||
@ -63,7 +63,9 @@ toolchain("gcc") {
|
||||
command = "g++ {{ldflags}} -o $outfile -Wl,--start-group @$rspfile {{solibs}} -Wl,--end-group {{libs}}"
|
||||
description = "LINK $outfile"
|
||||
rspfile_content = "{{inputs}}"
|
||||
outputs = [ outfile ]
|
||||
outputs = [
|
||||
outfile,
|
||||
]
|
||||
}
|
||||
|
||||
tool("stamp") {
|
||||
|
||||
@ -6,8 +6,9 @@
|
||||
source_set("generated_api_util") {
|
||||
sources = [
|
||||
"util.cc",
|
||||
"util.h"
|
||||
"util.h",
|
||||
]
|
||||
deps = [
|
||||
"//base",
|
||||
]
|
||||
deps = [ "//base" ]
|
||||
}
|
||||
|
||||
|
||||
@ -57,6 +57,8 @@ template("json_to_struct") {
|
||||
|
||||
sources = get_target_outputs(":$action_name")
|
||||
|
||||
deps = [ ":$action_name" ]
|
||||
deps = [
|
||||
":$action_name",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,7 +16,9 @@ if (current_toolchain == host_toolchain) {
|
||||
# GYP: //tools/relocation_packer/relocation_packer.gyp:lib_relocation_packer
|
||||
source_set("lib_relocation_packer") {
|
||||
defines = [ target_define ]
|
||||
deps = [ "//third_party/elfutils:libelf" ]
|
||||
deps = [
|
||||
"//third_party/elfutils:libelf",
|
||||
]
|
||||
configs -= [ "//build/config/compiler:chromium_code" ]
|
||||
configs += [ "//build/config/compiler:no_chromium_code" ]
|
||||
sources = [
|
||||
@ -37,7 +39,9 @@ if (current_toolchain == host_toolchain) {
|
||||
":lib_relocation_packer",
|
||||
"//third_party/elfutils:libelf",
|
||||
]
|
||||
sources = [ "src/main.cc" ]
|
||||
sources = [
|
||||
"src/main.cc",
|
||||
]
|
||||
}
|
||||
|
||||
# GYP: //tools/relocation_packer/relocation_packer.gyp:relocation_packer_unittests
|
||||
@ -61,7 +65,7 @@ if (current_toolchain == host_toolchain) {
|
||||
]
|
||||
defines = [
|
||||
target_define,
|
||||
"INTERMEDIATE_DIR=\"$rebased_test_data\""
|
||||
"INTERMEDIATE_DIR=\"$rebased_test_data\"",
|
||||
]
|
||||
include_dirs = [ "//" ]
|
||||
deps = [
|
||||
@ -84,9 +88,12 @@ if (current_toolchain == default_toolchain &&
|
||||
|
||||
# GYP: //tools/relocation_packer/relocation_packer.gyp:relocation_packer_test_data
|
||||
shared_library("relocation_packer_test_data") {
|
||||
cflags = [ "-O0", "-g0" ]
|
||||
cflags = [
|
||||
"-O0",
|
||||
"-g0",
|
||||
]
|
||||
sources = [
|
||||
"test_data/elf_file_unittest_relocs.cc"
|
||||
"test_data/elf_file_unittest_relocs.cc",
|
||||
]
|
||||
}
|
||||
|
||||
@ -124,12 +131,17 @@ if (current_toolchain == default_toolchain &&
|
||||
]
|
||||
|
||||
args = [
|
||||
"--android-pack-relocations", rebase_path(relocation_packer_exe, root_build_dir),
|
||||
"--android-objcopy", rebase_path(android_objcopy, root_build_dir),
|
||||
"--android-pack-relocations",
|
||||
rebase_path(relocation_packer_exe, root_build_dir),
|
||||
"--android-objcopy",
|
||||
rebase_path(android_objcopy, root_build_dir),
|
||||
"--added-section=$added_section",
|
||||
"--test-file", rebase_path(test_file, root_build_dir),
|
||||
"--packed-output", rebase_path(packed_output, root_build_dir),
|
||||
"--unpacked-output", rebase_path(unpacked_output, root_build_dir),
|
||||
"--test-file",
|
||||
rebase_path(test_file, root_build_dir),
|
||||
"--packed-output",
|
||||
rebase_path(packed_output, root_build_dir),
|
||||
"--unpacked-output",
|
||||
rebase_path(unpacked_output, root_build_dir),
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,13 +2,12 @@
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
relocation_packing_supported = (
|
||||
(target_arch == "arm") || (target_arch == "arm64"))
|
||||
relocation_packing_supported = target_arch == "arm" || target_arch == "arm64"
|
||||
|
||||
if (relocation_packing_supported) {
|
||||
relocation_packer_target = "//tools/relocation_packer($host_toolchain)"
|
||||
relocation_packer_dir = get_label_info(
|
||||
"$relocation_packer_target", "root_out_dir")
|
||||
relocation_packer_dir =
|
||||
get_label_info("$relocation_packer_target", "root_out_dir")
|
||||
relocation_packer_exe = "${relocation_packer_dir}/relocation_packer"
|
||||
|
||||
if (target_arch == "arm") {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user