Add chrome/renderer to the GN build.

Adds some dependencies, also enables compiling of chrome/common.

Adds disable_nacl and safe_browsing feature flags.

R=jamesr@chromium.org

Review URL: https://codereview.chromium.org/343233004

git-svn-id: http://src.chromium.org/svn/trunk/src/build@278916 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
brettw@chromium.org 2014-06-21 04:29:24 +00:00
Родитель 1ff59ada78
Коммит 9118eda7a2
2 изменённых файлов: 22 добавлений и 1 удалений

Просмотреть файл

@ -37,7 +37,6 @@ config("feature_flags") {
"ENABLE_NOTIFICATIONS", "ENABLE_NOTIFICATIONS",
"ENABLE_EGLIMAGE=1", "ENABLE_EGLIMAGE=1",
"ENABLE_TASK_MANAGER=1", "ENABLE_TASK_MANAGER=1",
"ENABLE_EXTENSIONS=1",
"ENABLE_PLUGIN_INSTALLATION=1", "ENABLE_PLUGIN_INSTALLATION=1",
"ENABLE_SESSION_SERVICE=1", "ENABLE_SESSION_SERVICE=1",
"ENABLE_THEMES=1", "ENABLE_THEMES=1",
@ -138,6 +137,12 @@ config("feature_flags") {
if (disable_ftp_support) { if (disable_ftp_support) {
defines += [ "DISABLE_FTP_SUPPORT=1" ] defines += [ "DISABLE_FTP_SUPPORT=1" ]
} }
if (!enable_nacl) {
defines += [ "DISABLE_NACL" ]
}
if (enable_extensions) {
defines += [ "ENABLE_EXTENSIONS=1" ]
}
} }
# Debug/release ---------------------------------------------------------------- # Debug/release ----------------------------------------------------------------

Просмотреть файл

@ -16,6 +16,9 @@ declare_args() {
enable_mdns = is_win || is_linux enable_mdns = is_win || is_linux
enable_plugins = !is_android || !is_ios enable_plugins = !is_android || !is_ios
# Enables Native Client support.
enable_nacl = (!is_ios && !is_android)
} }
# Additional dependent variables ----------------------------------------------- # Additional dependent variables -----------------------------------------------
@ -72,3 +75,16 @@ enable_speech_input = true
use_dbus = is_linux use_dbus = is_linux
enable_extensions = (!is_android && !is_ios) enable_extensions = (!is_android && !is_ios)
# Variable safe_browsing is used to control the build time configuration for
# safe browsing feature. Safe browsing can be compiled in 3 different levels: 0
# disables it, 1 enables it fully, and 2 enables only UI and reporting features
# without enabling phishing and malware detection. This is useful to integrate
# a third party phishing/malware detection to existing safe browsing logic.
if (is_android) {
safe_browsing_mode = 2
} else if (is_ios) {
safe_browsing_mode = 0
} else {
safe_browsing_mode = 1
}