Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1015)

Unified Diff: third_party/WebKit/Source/platform/BUILD.gn

Issue 1366653003: [Chromecast] Replace 'fontconfig' GN target with dynamic dependency. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Correct dep in //chrome/browser/chromeos Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « skia/BUILD.gn ('k') | ui/base/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/platform/BUILD.gn
diff --git a/third_party/WebKit/Source/platform/BUILD.gn b/third_party/WebKit/Source/platform/BUILD.gn
index 6e7885e4ada40900908a52ebf910cad938090a44..7ce0d060472153972851850648bc94ddb2271bea 100644
--- a/third_party/WebKit/Source/platform/BUILD.gn
+++ b/third_party/WebKit/Source/platform/BUILD.gn
@@ -14,20 +14,15 @@ visibility = [ ":*" ]
if (!is_mac) {
# TODO(GYP): can't link Blink binaries yet on mac.
- heap_gypi = exec_script(
- "//build/gypi_to_gn.py",
- [ rebase_path("heap/blink_heap.gypi") ],
- "scope",
- [ "heap/blink_heap.gypi" ])
+ heap_gypi = exec_script("//build/gypi_to_gn.py",
+ [ rebase_path("heap/blink_heap.gypi") ],
+ "scope",
+ [ "heap/blink_heap.gypi" ])
}
-blink_platform_neon_files = [
- "graphics/cpu/arm/WebGLImageConversionNEON.h",
-]
+blink_platform_neon_files = [ "graphics/cpu/arm/WebGLImageConversionNEON.h" ]
-blink_platform_sse_files = [
- "graphics/cpu/x86/WebGLImageConversionSSE.h",
-]
+blink_platform_sse_files = [ "graphics/cpu/x86/WebGLImageConversionSSE.h" ]
# blink_common in blink_platform.gyp
component("blink_common") {
@@ -35,8 +30,8 @@ component("blink_common") {
visibility = [ "//third_party/WebKit/*" ]
sources = [
"exported/WebCString.cpp",
- "exported/WebString.cpp",
"exported/WebCommon.cpp",
+ "exported/WebString.cpp",
]
defines = [
@@ -115,10 +110,10 @@ action("runtime_enabled_features") {
runtime_enabled_features_in = "RuntimeEnabledFeatures.in"
inputs = scripts_for_in_files + [
- runtime_enabled_features_in,
- "../build/scripts/templates/RuntimeEnabledFeatures.cpp.tmpl",
- "../build/scripts/templates/RuntimeEnabledFeatures.h.tmpl",
- ]
+ runtime_enabled_features_in,
+ "../build/scripts/templates/RuntimeEnabledFeatures.cpp.tmpl",
+ "../build/scripts/templates/RuntimeEnabledFeatures.h.tmpl",
+ ]
outputs = [
"$blink_platform_output_dir/RuntimeEnabledFeatures.cpp",
@@ -137,15 +132,21 @@ action("color_data") {
script = "../build/scripts/gperf.py"
color_data_gperf = "ColorData.gperf"
- inputs = [ color_data_gperf ]
+ inputs = [
+ color_data_gperf,
+ ]
output_file = "$blink_platform_output_dir/ColorData.cpp"
- outputs = [ output_file ]
+ outputs = [
+ output_file,
+ ]
args = [
gperf_exe,
"--key-positions=*",
- "-D", "-s", "2",
+ "-D",
+ "-s",
+ "2",
rebase_path(color_data_gperf, root_build_dir),
"--output-file=" + rebase_path(output_file, root_build_dir),
]
@@ -176,10 +177,9 @@ component("platform") {
sources -= blink_platform_sse_files
# Add in the generated files.
- sources +=
- get_target_outputs(":font_family_names") +
- get_target_outputs(":runtime_enabled_features") +
- get_target_outputs(":color_data")
+ sources += get_target_outputs(":font_family_names") +
+ get_target_outputs(":runtime_enabled_features") +
+ get_target_outputs(":color_data")
configs += [
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
@@ -220,17 +220,19 @@ component("platform") {
if (is_mac) {
sources -= [
- "fonts/skia/FontCacheSkia.cpp",
- # Uses LocaleMac instead.
- "text/LocaleICU.cpp",
- "text/LocaleICU.h",
# Uses KillRingMac.mm instead.
"KillRingNone.cpp",
+ "fonts/skia/FontCacheSkia.cpp",
+ "scroll/ScrollAnimatorNone.cpp",
+ "scroll/ScrollAnimatorNone.h",
+
# Mac uses only ScrollAnimatorMac.
"scroll/ScrollbarThemeNonMacCommon.cpp",
"scroll/ScrollbarThemeNonMacCommon.h",
- "scroll/ScrollAnimatorNone.cpp",
- "scroll/ScrollAnimatorNone.h",
+
+ # Uses LocaleMac instead.
+ "text/LocaleICU.cpp",
+ "text/LocaleICU.h",
]
# Some Mac-specific parts of WebKit won't compile without having this
@@ -261,6 +263,7 @@ component("platform") {
if (is_win) {
sources -= [
"clipboard/ClipboardUtilitiesPosix.cpp",
+
# Uses LocaleWin instead.
"text/LocaleICU.cpp",
"text/LocaleICU.h",
@@ -285,13 +288,11 @@ component("platform") {
]
set_sources_assignment_filter(sources_assignment_filter)
} else {
- sources -= [
- "scroll/ScrollbarThemeAndroid.cpp",
- ]
+ sources -= [ "scroll/ScrollbarThemeAndroid.cpp" ]
}
if (is_linux) {
- public_configs = [ "//build/config/linux:fontconfig" ]
+ public_deps += [ "//build/linux:fontconfig" ]
}
if (!use_default_render_theme) {
@@ -349,9 +350,7 @@ if (!is_mac) {
"//third_party/WebKit/Source:config",
]
- defines = [
- "INSIDE_BLINK",
- ]
+ defines = [ "INSIDE_BLINK" ]
deps = [
":platform",
@@ -396,17 +395,12 @@ if (!is_mac) {
"//url",
]
- defines = [
- "INSIDE_BLINK",
- ]
+ defines = [ "INSIDE_BLINK" ]
- include_dirs = [
- "$root_gen_dir/blink",
- ]
+ include_dirs = [ "$root_gen_dir/blink" ]
}
}
-
if (current_cpu == "arm") {
source_set("blink_arm_neon") {
sources = blink_platform_neon_files
@@ -422,14 +416,17 @@ if (current_cpu == "arm") {
# }],
# ],
- deps = [ ":blink_common" ]
+ deps = [
+ ":blink_common",
+ ]
}
}
-
if (current_cpu == "x86" || current_cpu == "x64") {
source_set("blink_x86_sse") {
sources = blink_platform_sse_files
- deps = [ ":blink_common" ]
+ deps = [
+ ":blink_common",
+ ]
}
}
« no previous file with comments | « skia/BUILD.gn ('k') | ui/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698