diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py index 76d89eb590e5..cff5552938c8 100755 --- a/gn/gn_to_bp.py +++ b/gn/gn_to_bp.py @@ -656,10 +656,6 @@ def strip_headers(sources): 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 0c174f071b81..6105396670bb 100644 --- a/gn/skqp_gn_args.py +++ b/gn/skqp_gn_args.py @@ -6,6 +6,7 @@ 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',