AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Reland "Add defines to skqp build""

Browse Source 
This reverts commit 2ceed56917.

Reason for revert: Still breaking android

Original change's description:
> Reland "Add defines to skqp build"
>
> Change-Id: Ic038e6e3279eda7994cf29d886bee0d4d2e69e0b
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/511802
> Reviewed-by: Leon Scroggins <scroggo@google.com>
> Commit-Queue: Nathaniel Nifong <nifong@google.com>

Change-Id: Ic93e9e9cedac2fd7313681f44ba4e87ff1b91241
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/512156
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
This commit is contained in:
Leon Scroggins 2022-02-23 13:50:41 +00:00 committed by SkCQ
parent 1e420a3652
commit 4ae863ba8a
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gn/gn_to_bp.py
View File

@ -656,10 +656,6 @@ 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)

1
gn/skqp_gn_args.py
View File

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