Add lots of GN targets:
components/autofill components/metrics components/policy components/variations third_party/libphonenumber third_party/mt19937ar ui/gfx/ipc These are all requried to compile chrome/browser in some form or another. Fills out all grit_defines (also required for chrome/browser) and adds associated flags for them. Add the ability for generated_extensions_api to not generate a bundle. Remove mt19937ar from .gitignore (it's just checked into the tree) R=ajwong@chromium.org Review URL: https://codereview.chromium.org/365793002 git-svn-id: http://src.chromium.org/svn/trunk/src/build@281057 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
9f9e39c561
Коммит
b45a2ea9a4
|
@ -32,12 +32,9 @@ config("feature_flags") {
|
|||
defines = [
|
||||
"CHROMIUM_BUILD",
|
||||
"ENABLE_ONE_CLICK_SIGNIN",
|
||||
"ENABLE_REMOTING=1",
|
||||
"ENABLE_NOTIFICATIONS",
|
||||
"ENABLE_EGLIMAGE=1",
|
||||
"ENABLE_BACKGROUND=1",
|
||||
"ENABLE_GOOGLE_NOW=1",
|
||||
"ENABLE_SETTINGS_APP=1",
|
||||
"USE_MOJO=1",
|
||||
"V8_DEPRECATION_WARNINGS", # Don't use deprecated V8 APIs anywhere.
|
||||
# Temporary suppression until Blink code can be removed.
|
||||
|
@ -160,6 +157,9 @@ config("feature_flags") {
|
|||
if (enable_app_list) {
|
||||
defines += [ "ENABLE_APP_LIST=1" ]
|
||||
}
|
||||
if (enable_settings_app) {
|
||||
defines += [ "ENABLE_SETTINGS_APP=1" ]
|
||||
}
|
||||
if (enable_managed_users) {
|
||||
defines += [ "ENABLE_MANAGED_USERS=1" ]
|
||||
}
|
||||
|
@ -172,6 +172,15 @@ config("feature_flags") {
|
|||
if (enable_wifi_bootstrapping) {
|
||||
defines += [ "ENABLE_WIFI_BOOTSTRAPPING=1" ]
|
||||
}
|
||||
if (enable_image_loader_extension) {
|
||||
defines += [ "IMAGE_LOADER_EXTENSION=1" ]
|
||||
}
|
||||
if (enable_remoting) {
|
||||
defines += [ "ENABLE_REMOTING=1" ]
|
||||
}
|
||||
if (enable_google_now) {
|
||||
defines += [ "ENABLE_GOOGLE_NOW=1" ]
|
||||
}
|
||||
}
|
||||
|
||||
# Debug/release ----------------------------------------------------------------
|
||||
|
|
|
@ -128,6 +128,7 @@ enable_rlz = is_chrome_branded && (is_win || is_mac || is_ios || is_chromeos)
|
|||
enable_plugin_installation = is_win || is_mac
|
||||
|
||||
enable_app_list = !is_ios && !is_android
|
||||
enable_settings_app = enable_app_list && !is_chromeos
|
||||
|
||||
enable_managed_users = !is_ios
|
||||
|
||||
|
@ -136,3 +137,10 @@ enable_service_discovery = enable_mdns || is_mac
|
|||
enable_autofill_dialog = !is_ios && !(is_android && is_android_webview_build)
|
||||
|
||||
enable_wifi_bootstrapping = is_win || is_mac
|
||||
|
||||
# Image loader extension is enabled on ChromeOS only.
|
||||
enable_image_loader_extension = is_chromeos
|
||||
|
||||
enable_remoting = !is_ios && !is_android
|
||||
|
||||
enable_google_now = !is_ios && !is_android
|
||||
|
|
|
@ -56,6 +56,10 @@ pkg_config("dbus") {
|
|||
packages = [ "dbus-1" ]
|
||||
}
|
||||
|
||||
pkg_config("gnome_keyring") {
|
||||
packages = [ "gnome-keyring-1" ]
|
||||
}
|
||||
|
||||
if (use_evdev_gestures) {
|
||||
pkg_config("libevdev-cros") {
|
||||
packages = [ "libevdev-cros" ]
|
||||
|
@ -95,6 +99,10 @@ config("xrandr") {
|
|||
libs = [ "xrandr" ]
|
||||
}
|
||||
|
||||
config("xscrnsaver") {
|
||||
libs = [ "Xss" ]
|
||||
}
|
||||
|
||||
config("libcap") {
|
||||
libs = [ "cap" ]
|
||||
}
|
||||
|
|
|
@ -17,8 +17,7 @@
|
|||
},
|
||||
'rules': [
|
||||
{
|
||||
# GN version: //build/json_schema.gni
|
||||
# (json_schema_compile template)
|
||||
# GN version: //extensions/generated_extensions_api.gni
|
||||
'rule_name': 'genapi',
|
||||
'msvs_external_rule': 1,
|
||||
'extension': 'json',
|
||||
|
|
|
@ -25,11 +25,30 @@
|
|||
# # You can also put deps here if the grit source depends on generated
|
||||
# # files.
|
||||
# }
|
||||
import ("//build/config/crypto.gni")
|
||||
import ("//build/config/features.gni")
|
||||
import ("//build/config/ui.gni")
|
||||
|
||||
grit_defines = []
|
||||
|
||||
# Mac and iOS want Title Case strings.
|
||||
use_titlecase_in_grd_files = is_mac || is_ios
|
||||
if (use_titlecase_in_grd_files) {
|
||||
grit_defines += [ "-D", "use_titlecase" ]
|
||||
}
|
||||
|
||||
if (is_chrome_branded) {
|
||||
grit_defines += [
|
||||
"-D", "_google_chrome",
|
||||
"-E", "CHROMIUM_BUILD=google_chrome",
|
||||
]
|
||||
} else {
|
||||
grit_defines += [
|
||||
"-D", "_chromium",
|
||||
"-E", "CHROMIUM_BUILD=chromium",
|
||||
]
|
||||
}
|
||||
|
||||
if (is_chromeos) {
|
||||
grit_defines += [
|
||||
"-D", "chromeos",
|
||||
|
@ -41,6 +60,34 @@ if (is_desktop_linux) {
|
|||
grit_defines += [ "-D", "desktop_linux" ]
|
||||
}
|
||||
|
||||
if (toolkit_views) {
|
||||
grit_defines += [ "-D", "toolkit_views" ]
|
||||
}
|
||||
|
||||
if (use_aura) {
|
||||
grit_defines += [ "-D", "use_aura" ]
|
||||
}
|
||||
|
||||
if (use_ash) {
|
||||
grit_defines += [ "-D", "use_ash" ]
|
||||
}
|
||||
|
||||
if (use_nss_certs) {
|
||||
grit_defines += [ "-D", "use_nss" ]
|
||||
}
|
||||
|
||||
if (use_ozone) {
|
||||
grit_defines += [ "-D", "use_ozone" ]
|
||||
}
|
||||
|
||||
if (enable_image_loader_extension) {
|
||||
grit_defines += [ "-D", "image_loader_extension" ]
|
||||
}
|
||||
|
||||
if (enable_remoting) {
|
||||
grit_defines += [ "-D", "remoting" ]
|
||||
}
|
||||
|
||||
if (is_android) {
|
||||
grit_defines += [
|
||||
"-t", "android",
|
||||
|
@ -48,26 +95,61 @@ if (is_android) {
|
|||
]
|
||||
}
|
||||
|
||||
if (is_mac || is_ios) {
|
||||
grit_defines += [ "-D", "scale_factors=2x" ]
|
||||
}
|
||||
|
||||
if (is_ios) {
|
||||
grit_defines += [
|
||||
"-t", "ios",
|
||||
# iOS uses a whitelist to filter resources.
|
||||
"-w", rebase_path("//build/ios/grit_whitelist.txt", root_build_dir),
|
||||
]
|
||||
}
|
||||
|
||||
if (enable_extensions) {
|
||||
grit_defines += [ "-D", "enable_extensions" ]
|
||||
}
|
||||
if (enable_plugins) {
|
||||
grit_defines += [ "-D", "enable_plugins" ]
|
||||
}
|
||||
if (enable_task_manager) {
|
||||
grit_defines += [ "-D", "enable_task_manager" ]
|
||||
if (enable_printing != 0) {
|
||||
grit_defines += [ "-D", "enable_printing" ]
|
||||
if (enable_printing == 1) {
|
||||
grit_defines += [ "-D", "enable_full_printing" ]
|
||||
}
|
||||
}
|
||||
if (enable_themes) {
|
||||
grit_defines += [ "-D", "enable_themes" ]
|
||||
}
|
||||
if (enable_app_list) {
|
||||
grit_defines += [ "-D", "enable_app_list" ]
|
||||
}
|
||||
if (enable_service_discovery) {
|
||||
grit_defines += [ "-D", "enable_service_discovery" ]
|
||||
if (enable_settings_app) {
|
||||
grit_defines += [ "-D", "enable_settings_app" ]
|
||||
}
|
||||
if (enable_google_now) {
|
||||
grit_defines += [ "-D", "enable_google_now" ]
|
||||
}
|
||||
# Note: use_concatenated_impulse_responses is omitted. It is never used and
|
||||
# should probably be removed from GYP build.
|
||||
if (enable_webrtc) {
|
||||
grit_defines += [ "-D", "enable_webrtc" ]
|
||||
}
|
||||
# Note: enable_hangout_services_extension is omitted. It is never set in the
|
||||
# GYP build. Need to figure out what it's for.
|
||||
if (enable_task_manager) {
|
||||
grit_defines += [ "-D", "enable_task_manager" ]
|
||||
}
|
||||
if (enable_notifications) {
|
||||
grit_defines += [ "-D", "enable_notifications" ]
|
||||
}
|
||||
if (enable_wifi_bootstrapping) {
|
||||
grit_defines += [ "-D", "enable_wifi_bootstrapping" ]
|
||||
}
|
||||
|
||||
# TODO(GYP) the rest of the grit_defines from the gyp build.
|
||||
if (enable_service_discovery) {
|
||||
grit_defines += [ "-D", "enable_service_discovery" ]
|
||||
}
|
||||
|
||||
grit_resource_id_file = "//tools/gritsettings/resource_ids"
|
||||
grit_info_script = "//tools/grit/grit_info.py"
|
||||
|
|
Загрузка…
Ссылка в новой задаче