From 87ccf33f157ad4a6d83ba079e43192b45d39cb6d Mon Sep 17 00:00:00 2001 From: Florin Malita Date: Fri, 4 May 2018 12:23:24 -0400 Subject: [skottie] Disable on Android Framework builds Make Skottie truly optional (own flag), and disable in framework builds (to unblock landing the RapidJson refactoring). Change-Id: I4611f915e43fe11c1f6754ab4a9f63e45af2f8d3 Reviewed-on: https://skia-review.googlesource.com/125872 Commit-Queue: Florin Malita Reviewed-by: Mike Klein --- gn/gn_to_bp.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gn/gn_to_bp.py') diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py index 1e73a97433..662580a298 100644 --- a/gn/gn_to_bp.py +++ b/gn/gn_to_bp.py @@ -212,13 +212,14 @@ cc_test { # We'll run GN to get the main source lists and include directories for Skia. gn_args = { - 'is_official_build': 'true', - 'skia_enable_tools': 'true', - 'skia_use_libheif': 'true', - 'skia_use_vulkan': 'true', - 'target_cpu': '"none"', - 'target_os': '"android"', - 'skia_vulkan_header': '"Skia_Vulkan_Android.h"', + 'is_official_build': 'true', + 'skia_enable_tools': 'true', + 'skia_enable_skottie': 'false', # requires rapidjson third-party + 'skia_use_libheif': 'true', + 'skia_use_vulkan': 'true', + 'target_cpu': '"none"', + 'target_os': '"android"', + 'skia_vulkan_header': '"Skia_Vulkan_Android.h"', } js = gn_to_bp_utils.GenerateJSONFromGN(gn_args) -- cgit v1.2.3