From f536c454bf6a75879f74a6f05cb7943057f4023d Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Tue, 1 May 2018 10:36:42 -0400 Subject: Reland "Retry enabling skcms on Android" This is a reland of 05b5e40519ae18939867f8de5d48f7c7a173f745 Original change's description: > 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 > Reviewed-by: Mike Klein Change-Id: I67041fb00687f789c80b7ba41acd3bf2cf257cf3 Reviewed-on: https://skia-review.googlesource.com/126825 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- gn/gn_to_bp.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gn/gn_to_bp.py') diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py index 662580a298..8ad221c93a 100644 --- a/gn/gn_to_bp.py +++ b/gn/gn_to_bp.py @@ -234,12 +234,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']) @@ -252,6 +246,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')} -- cgit v1.2.3