diff options
| author |  mtklein <mtklein@chromium.org> | 2016-09-16 07:45:52 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-16 07:45:52 -0700 |
| commit | 1bd72ba2cb349788223e3e7304f25751c87f1f95 (patch) | |
| tree | 5ad3b9dc7c69d653ffe3dcfac5ec3088036112c3 | |
| parent | 6c3baa66fa38349917783dde1ff2ee21684619fb (diff) | |
GN: add a flag to implement Android_FrameworkDefs bot.
This bot builds Skia with a bunch of defines to mimic the Android roll.
Apparently it was supposed to be on the CQ... I'll add the GN version
to it when it exists.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2343103002
Review-Url: https://codereview.chromium.org/2343103002
| -rw-r--r-- | BUILD.gn | 8 | ||||
| -rw-r--r-- | gn/shared_sources.gni | 17 |
2 files changed, 20 insertions, 5 deletions
@@ -18,6 +18,8 @@ declare_args() { skia_use_sfntly = !is_fuchsia skia_use_vulkan = is_android && defined(ndk_api) && ndk_api >= 24 skia_use_zlib = true + + skia_enable_android_framework_defines = false } fontmgr_android_enabled = skia_use_expat && skia_use_freetype @@ -222,6 +224,11 @@ template("optional") { } } +optional("android_framework_defines") { + enabled = skia_enable_android_framework_defines + public_defines = skia_android_framework_defines +} + optional("fontmgr_android") { enabled = fontmgr_android_enabled @@ -384,6 +391,7 @@ component("skia") { configs += skia_library_configs deps = [ + ":android_framework_defines", ":arm64", ":armv7", ":avx", diff --git a/gn/shared_sources.gni b/gn/shared_sources.gni index 71c3b548d2..2da3d2cb79 100644 --- a/gn/shared_sources.gni +++ b/gn/shared_sources.gni @@ -71,14 +71,21 @@ _pdf_gypi = exec_script("gypi_to_gn.py", skia_pdf_sources = _pdf_gypi.sources _sources_gypi = exec_script("gypi_to_gn.py", - [ - rebase_path("../gyp/skia_sources.gypi"), - ], - "scope", - [ "../gyp/skia_sources.gypi" ]) + [ rebase_path("../gyp/skia_sources.gypi") ], + "scope", + [ "../gyp/skia_sources.gypi" ]) skia_sksl_sources = get_path_info(_sources_gypi.sksl_sources, "abspath") skia_utils_sources = get_path_info(_sources_gypi.utils_sources, "abspath") # Skia Chromium defines. These flags will be defined in chromium If these # become 'permanent', they should be moved into Chrome's skia build file. skia_for_chromium_defines = [ "SK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS" ] + +_android_framework_defines = + exec_script( + "gypi_to_gn.py", + [ rebase_path("../gyp/skia_for_android_framework_defines.gypi") ], + "scope", + [ "../gyp/core.gypi" ]) +skia_android_framework_defines = + _android_framework_defines.skia_for_android_framework_defines |