Skip to content

Commit

Permalink
Include sharing proc in skia static library when building for android.
Browse files Browse the repository at this point in the history
So it can be used for SKP serialization.

Bug: 9203
Change-Id: I094d5222f220bb79c7f61fd5ebebf48e23e97b0b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/223705
Commit-Queue: Nathaniel Nifong <[email protected]>
Reviewed-by: Derek Sollenberger <[email protected]>
  • Loading branch information
Nathaniel Nifong authored and Skia Commit-Bot committed Jun 25, 2019
1 parent 9907e6e commit 0c4fbf1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
5 changes: 5 additions & 0 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ declare_args() {
skia_llvm_lib = "LLVM"

skia_tools_require_resources = false
skia_include_multiframe_procs = false
}
declare_args() {
skia_use_dng_sdk = !is_fuchsia && skia_use_libjpeg_turbo && skia_use_zlib
Expand Down Expand Up @@ -1044,6 +1045,10 @@ component("skia") {
deps += [ "//third_party/spirv-tools" ]
defines += [ "SK_ENABLE_SPIRV_VALIDATION" ]
}

if (skia_include_multiframe_procs) {
sources += [ "tools/SkSharingProc.cpp" ]
}
}

# DebugCanvas used in experimental/wasm-skp-debugger
Expand Down
2 changes: 2 additions & 0 deletions gn/gn_to_bp.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,11 +313,13 @@ def generate_args(target_os, enable_gpu):
'skia_use_freetype': 'true',
'skia_use_fontconfig': 'false',
'skia_use_fixed_gamma_text': 'true',
'skia_include_multiframe_procs': 'false',
}
d['target_os'] = target_os
if target_os == '"android"':
d['skia_enable_tools'] = 'true'
d['skia_use_libheif'] = 'true'
d['skia_include_multiframe_procs'] = 'true'
else:
d['skia_use_libheif'] = 'false'

Expand Down

0 comments on commit 0c4fbf1

Please sign in to comment.