Chromium Code Reviews| Index: BUILD.gn |
| diff --git a/BUILD.gn b/BUILD.gn |
| index b28edd0456dc3d91a05705da5e348f08a2fb4723..85f1624822bb7567c1c3b217970e443e4926451f 100644 |
| --- a/BUILD.gn |
| +++ b/BUILD.gn |
| @@ -70,13 +70,17 @@ skia_library_configs = [ |
| ":skia_library", |
| ] |
| -# Chrome's GN environment is mostly helpful, but a couple default configs tend to get in the way. |
| -unwanted_configs = [ |
| - "//build/config/clang:find_bad_constructs", # Chrome style checks. |
| - "//build/config:feature_flags", # A bunch of #defines we don't care about. |
| -] |
| +unwanted_configs = [] |
| + |
| +if (!is_fuchsia) { |
|
mtklein
2016/07/15 16:54:03
Is this... you sync Skia under a Fuschia GN root,
abarth
2016/07/15 17:48:54
That's correct. Our gn environment is less opinio
|
| + # Chrome's GN environment is mostly helpful, but a couple default configs tend to get in the way. |
| + unwanted_configs += [ |
| + "//build/config/clang:find_bad_constructs", # Chrome style checks. |
| + "//build/config:feature_flags", # A bunch of #defines we don't care about. |
| + ] |
| +} |
| -core_gypi = exec_script("build/gypi_to_gn.py", |
| +core_gypi = exec_script("//build/gypi_to_gn.py", |
| [ |
| rebase_path("gyp/core.gypi"), |
| "--replace=<(skia_include_path)=include", |
| @@ -85,7 +89,7 @@ core_gypi = exec_script("build/gypi_to_gn.py", |
| "scope", |
| [ "gyp/core.gypi" ]) |
| -effects_gypi = exec_script("build/gypi_to_gn.py", |
| +effects_gypi = exec_script("//build/gypi_to_gn.py", |
| [ |
| rebase_path("gyp/effects.gypi"), |
| "--replace=<(skia_include_path)=include", |
| @@ -94,7 +98,7 @@ effects_gypi = exec_script("build/gypi_to_gn.py", |
| "scope", |
| [ "gyp/effects.gypi" ]) |
| -gpu_gypi = exec_script("build/gypi_to_gn.py", |
| +gpu_gypi = exec_script("//build/gypi_to_gn.py", |
| [ |
| rebase_path("gyp/gpu.gypi"), |
| "--replace=<(skia_include_path)=include", |
| @@ -103,7 +107,7 @@ gpu_gypi = exec_script("build/gypi_to_gn.py", |
| "scope", |
| [ "gyp/gpu.gypi" ]) |
| -opts_gypi = exec_script("build/gypi_to_gn.py", |
| +opts_gypi = exec_script("//build/gypi_to_gn.py", |
| [ |
| rebase_path("gyp/opts.gypi"), |
| "--replace=<(skia_include_path)=include", |
| @@ -112,7 +116,7 @@ opts_gypi = exec_script("build/gypi_to_gn.py", |
| "scope", |
| [ "gyp/opts.gypi" ]) |
| -pdf_gypi = exec_script("build/gypi_to_gn.py", |
| +pdf_gypi = exec_script("//build/gypi_to_gn.py", |
| [ |
| rebase_path("gyp/pdf.gypi"), |
| "--replace=<(skia_include_path)=include", |
| @@ -121,7 +125,7 @@ pdf_gypi = exec_script("build/gypi_to_gn.py", |
| "scope", |
| [ "gyp/pdf.gypi" ]) |
| -utils_gypi = exec_script("build/gypi_to_gn.py", |
| +utils_gypi = exec_script("//build/gypi_to_gn.py", |
| [ |
| rebase_path("gyp/utils.gypi"), |
| "--replace=<(skia_include_path)=include", |
| @@ -163,9 +167,14 @@ component("skia") { |
| ":opts_avx", |
| ":opts_sse41", |
| ":opts_ssse3", |
| - "third_party:zlib", |
| ] |
| + if (is_fuchsia) { |
| + deps += [ "//third_party/zlib" ] |
|
mtklein
2016/07/15 16:54:03
Think we should just create third_party/zlib/BUILD
abarth
2016/07/15 17:48:54
Yes, that would make more sense. Do you want me t
|
| + } else { |
| + deps += [ "third_party:zlib" ] |
| + } |
| + |
| libs = [] |
| sources = [] |
| @@ -239,6 +248,12 @@ component("skia") { |
| ] |
| libs += [ "ApplicationServices.framework" ] |
| } |
| + |
| + if (is_fuchsia) { |
| + sources += [ |
| + "src/ports/SkFontMgr_empty_factory.cpp", |
| + ] |
| + } |
| } |
| executable("example") { |