From b8cb2f4476e4a49489e7de3ecc5265e0b04e563b Mon Sep 17 00:00:00 2001 From: Nathaniel Nifong Date: Wed, 23 Feb 2022 10:54:40 -0500 Subject: [PATCH] 2nd Reland "Add defines to skqp build" Change-Id: Ia4c5e818be529ca765673266f64f96bf41a15552 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512146 Auto-Submit: Nathaniel Nifong Reviewed-by: Leon Scroggins Commit-Queue: Leon Scroggins --- gn/gn_to_bp.py | 4 ++++ gn/skqp_gn_args.py | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py index cff5552938..03315a0e9f 100755 --- a/gn/gn_to_bp.py +++ b/gn/gn_to_bp.py @@ -656,6 +656,10 @@ gn_to_bp_utils.GrabDependentValues(js_skqp, '//:libskqp_app', 'cflags_cc', gn_to_bp_utils.GrabDependentValues(js_skqp, '//:libskqp_app', 'defines', skqp_defines, None) +skqp_defines.add("SK_ENABLE_DUMP_GPU") +skqp_defines.add("SK_BUILD_FOR_SKQP") +skqp_defines.add("SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1") + skqp_srcs = strip_headers(skqp_srcs) skqp_cflags = gn_to_bp_utils.CleanupCFlags(skqp_cflags) skqp_cflags_cc = gn_to_bp_utils.CleanupCCFlags(skqp_cflags_cc) diff --git a/gn/skqp_gn_args.py b/gn/skqp_gn_args.py index 6105396670..0c174f071b 100644 --- a/gn/skqp_gn_args.py +++ b/gn/skqp_gn_args.py @@ -6,7 +6,6 @@ def GetGNArgs(api_level, debug, arch=None, ndk=None, is_android_bp=False): gn_args = { 'ndk_api': api_level, 'is_debug': 'true' if debug else 'false', - 'extra_cflags': '[ "-DSK_ENABLE_DUMP_GPU", "-DSK_BUILD_FOR_SKQP" ]', 'skia_enable_fontmgr_android': 'false', 'skia_enable_fontmgr_empty': 'true', 'skia_enable_pdf': 'false',