2nd Reland "Add defines to skqp build"

Change-Id: Ia4c5e818be529ca765673266f64f96bf41a15552
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512146
Auto-Submit: Nathaniel Nifong <nifong@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
This commit is contained in:
Nathaniel Nifong 2022-02-23 10:54:40 -05:00 committed by SkCQ
parent 19b722d8d7
commit b8cb2f4476
2 changed files with 4 additions and 1 deletions

View File

@ -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)

View File

@ -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',