From 1bd72ba2cb349788223e3e7304f25751c87f1f95 Mon Sep 17 00:00:00 2001 From: mtklein Date: Fri, 16 Sep 2016 07:45:52 -0700 Subject: 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 --- gn/shared_sources.gni | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'gn/shared_sources.gni') 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 -- cgit v1.2.3