Make content_shell link in the GN build.
It doesn't run yet. This disables WebRTC since that's not done yet. Libvpx isn't done either. This patch exports the disable flag for this from media to dependent targets like the GYP build does. It adds one extra check for this flag in Pepper. I assume everybody that compiles without libvpx also disables plugins so this has never come up before. Disable some warnings in Mesa. The resulting binary does not yet run. R=jamesr@chromium.org Review URL: https://codereview.chromium.org/419913003 git-svn-id: http://src.chromium.org/svn/trunk/src/build@285962 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
81b9283411
Коммит
657f4d96d1
|
@ -29,6 +29,11 @@ declare_args() {
|
|||
# resources.pak. It is still possible to load JS files from disk by passing
|
||||
# --debug-devtools cmdline switch.
|
||||
debug_devtools = false
|
||||
|
||||
# Enables WebRTC.
|
||||
#enable_webrtc = !is_ios TODO(GYP) use this condition when WebRTC works in
|
||||
# the GN build.
|
||||
enable_webrtc = false
|
||||
}
|
||||
|
||||
# Additional dependent variables -----------------------------------------------
|
||||
|
@ -68,8 +73,6 @@ if (is_android) {
|
|||
use_seccomp_bpf = (is_linux || is_android) &&
|
||||
(cpu_arch == "x86" || cpu_arch == "x64" || cpu_arch == "arm")
|
||||
|
||||
enable_webrtc = !is_ios
|
||||
|
||||
# Enable notifications everywhere except Android/iOS.
|
||||
# Android is http://crbug.com/115320
|
||||
enable_notifications = !is_android && !is_ios
|
||||
|
|
|
@ -5,7 +5,17 @@
|
|||
declare_args() {
|
||||
# Tells icu to load an external data file rather than rely on the icudata
|
||||
# being linked directly into the binary.
|
||||
icu_use_data_file = false
|
||||
#
|
||||
# This flag is a bit confusing. As of this writing, icu.gyp set the value to
|
||||
# 0 but common.gypi sets the value to 1 for most platforms (and the 1 takes
|
||||
# precedence).
|
||||
#
|
||||
# TODO(GYP) We'll probably need to enhance this logic to set the value to
|
||||
# true or false in similar circumstances. Note that in the GYP build, some
|
||||
# other projects access this variable. If we need to do a similar thing,
|
||||
# we should probably make an icu config file (//third_party/icu/config.gni)
|
||||
# with this flag in it rather than making it global.
|
||||
icu_use_data_file = true
|
||||
}
|
||||
|
||||
# Meta target that includes both icuuc and icui18n. Most targets want both.
|
||||
|
@ -470,7 +480,7 @@ if (icu_use_data_file) {
|
|||
} else {
|
||||
copy("icudata") {
|
||||
if (is_android) {
|
||||
sources = [ "android/icudt.dat" ]
|
||||
sources = [ "android/icudtl.dat" ]
|
||||
} else {
|
||||
sources = [ "source/data/in/icudtl.dat" ]
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче