diff options
author | Leon Scroggins III <scroggo@google.com> | 2017-08-17 15:13:20 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-18 14:40:29 +0000 |
commit | 04be2b54ba07a076d59bea7dcbd063641010d77d (patch) | |
tree | 0b06118f8d83cc15dce38d97576b8bf8b7399f34 /gn | |
parent | 20af6d12eefd8d937bc13bdb7fa0a9ac86b699af (diff) |
Reland "skia: add heif decoding support"
This reverts commit db68a426b6ba3a0fa1cace25ac306037eb7413a6.
Fixes errors in Android and Google3
Bug: b/64077740
Change-Id: I3d2bb1223e4d8ba912ea2b88144aeecc487fce1a
Reviewed-on: https://skia-review.googlesource.com/35701
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Chong Zhang <chz@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Diffstat (limited to 'gn')
-rw-r--r-- | gn/gn_to_bp.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py index 8248ef8edd..56fa3cc784 100644 --- a/gn/gn_to_bp.py +++ b/gn/gn_to_bp.py @@ -31,6 +31,7 @@ tool_shared_libs = [ 'libicui18n', 'libexpat', 'libft2', + 'libheif', 'libdng_sdk', 'libpiex', 'libcutils', @@ -124,6 +125,7 @@ cc_library { "libdng_sdk", "libexpat", "libft2", + "libheif", "libicui18n", "libicuuc", "libjpeg", @@ -195,6 +197,7 @@ cc_test { gn_args = { 'is_official_build': 'true', 'skia_enable_tools': 'true', + 'skia_use_libheif': 'true', 'skia_use_vulkan': 'true', 'target_cpu': '"none"', 'target_os': '"android"', |