diff options
| author |  Mike Klein <mtklein@chromium.org> | 2018-05-01 10:36:42 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-01 16:40:44 +0000 |
| commit | 05b5e40519ae18939867f8de5d48f7c7a173f745 (patch) | |
| tree | 2d7c113ede951d5b29f9721bfc5bd432797da943 /gn | |
| parent | dc3192b30a9e42aea8ff8d0c01ea585c79902704 (diff) | |
Retry enabling skcms on Android
Since we tried this last, DM has a direct skcms dependency
via tests/ColorSpaceTest.cpp, so I've rearranged gn_to_bp.py slightly.
We need to keep our eyes out for BitmapRGBAF16Test.testGetPixel in CTS.
Change-Id: I3630bbebb4574522c43362c359d1a14da3bdd480
Reviewed-on: https://skia-review.googlesource.com/124720
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/gn_to_bp.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py index 1e73a97433..101c1476b5 100644 --- a/gn/gn_to_bp.py +++ b/gn/gn_to_bp.py @@ -233,12 +233,6 @@ local_includes = strip_slashes(js['targets']['//:skia']['include_dirs']) export_includes = strip_slashes(js['targets']['//:public']['include_dirs']) defines = [str(d) for d in js['targets']['//:skia']['defines']] -# We need to add skcms.c, which lives in third_party -srcs.add("third_party/skcms/skcms.c") -local_includes.add("third_party/skcms") -# TODO: re-enable after relaxing CTS tests -defines.remove('SK_USE_SKCMS') - dm_srcs = strip_slashes(js['targets']['//:dm']['sources']) dm_includes = strip_slashes(js['targets']['//:dm']['include_dirs']) @@ -251,6 +245,11 @@ gn_to_bp_utils.GrabDependentValues(js, '//:dm', 'sources', dm_srcs, 'skia') gn_to_bp_utils.GrabDependentValues(js, '//:nanobench', 'sources', nanobench_srcs, 'skia') +# skcms is a little special, kind of a second-party library. +srcs .add("third_party/skcms/skcms.c") +local_includes.add("third_party/skcms") +dm_includes .add("third_party/skcms") + # No need to list headers. srcs = {s for s in srcs if not s.endswith('.h')} dm_srcs = {s for s in dm_srcs if not s.endswith('.h')} |