From 91368c9b9b0c3071babb3352646f9795e0b828fd Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Tue, 1 May 2018 18:57:00 +0000 Subject: Revert "Retry enabling skcms on Android" This reverts commit 05b5e40519ae18939867f8de5d48f7c7a173f745. Reason for revert: BitmapColorSpaceTest.android.graphics.cts.BitmapColorSpaceTest.inColorSpaceP3ToSRGB (android.graphics.cts) 06.949 java.lang.AssertionError: expected:<67043583> but was:<117375231> at org.junit.Assert.fail(Assert.java:88) at org.junit.Assert.failNotEquals(Assert.java:834) at org.junit.Assert.assertEquals(Assert.java:645) at org.junit.Assert.assertEquals(Assert.java:631) at android.graphics.cts.BitmapColorSpaceTest.verifyGetPixel(BitmapColorSpaceTest.java:301) at android.graphics.cts.BitmapColorSpaceTest.inColorSpaceP3ToSRGB(BitmapColorSpaceTest.java:612) at java.lang.reflect.Method.invoke(Native Method) at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50) at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:52) at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17) at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:148) at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:142) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.lang.Thread.run(Thread.java:764) >>> hex(117375231) '0x6ff00ff' >>> hex(67043583) '0x3ff00ff' 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 TBR=mtklein@chromium.org,mtklein@google.com,brianosman@google.com Change-Id: Ib11393c427e9c5fea645de6e6e9a3034dcf06d02 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/125041 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- gn/gn_to_bp.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gn/gn_to_bp.py') diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py index 101c1476b5..1e73a97433 100644 --- a/gn/gn_to_bp.py +++ b/gn/gn_to_bp.py @@ -233,6 +233,12 @@ 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']) @@ -245,11 +251,6 @@ 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