diff options
author | Mike Klein <mtklein@chromium.org> | 2017-01-13 15:27:45 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-13 21:17:05 +0000 |
commit | 1c471874c52cfb811fce8a5beed447042319f515 (patch) | |
tree | fa9f38b4aa9e750373bbc945657cf36a856c16b0 /gn/gn_to_bp.py | |
parent | 276be051066bc453d22d3e0b947bb96a7d99fa08 (diff) |
Fix Android roll
- only depend on cpu-features when we know we have an NDK
- disable SkSplicer
Change-Id: I89e4cc70d6ddf0ebb7005d1cb453768d946cd205
Reviewed-on: https://skia-review.googlesource.com/7060
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'gn/gn_to_bp.py')
-rw-r--r-- | gn/gn_to_bp.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py index 754db3653d..517324626c 100644 --- a/gn/gn_to_bp.py +++ b/gn/gn_to_bp.py @@ -108,6 +108,7 @@ cc_library { # We'll run GN to get the main source lists and include directories for Skia. gn_args = { + 'skia_enable_splicer': 'false', 'skia_enable_vulkan_debug_layers': 'false', 'skia_use_system_expat': 'true', 'skia_use_vulkan': 'true', |