| commit | e86d74f45314456eb9ad0b1c63e9ea217a03dc8e | [log] [tgz] |
|---|---|---|
| author | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Tue Feb 28 23:04:42 2017 +0000 |
| committer | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Tue Feb 28 23:04:42 2017 +0000 |
| tree | c76d0672233a9b5a4b6736b23777ef871c4188aa | |
| parent | 3a12413cb38a33516c3d06c88327ac2f541a5fb5 [diff] [blame] | |
| parent | 32f2818c9d10090efeea62ccc211d48a33322dfb [diff] [blame] |
Merge latest Skia into master (5 commits) https://skia.googlesource.com/skia.git/+log/585dba8..32f2818 Test: Presubmit checks will test this change. Change-Id: Ia857ba9186b05174d52f0036b4aab7bdca4252d5
diff --git a/Android.bp b/Android.bp index 2305a10..73f4d9f 100644 --- a/Android.bp +++ b/Android.bp
@@ -1258,6 +1258,7 @@ "tests/ColorSpaceXformTest.cpp", "tests/ColorTest.cpp", "tests/CopySurfaceTest.cpp", + "tests/CrossContextImageTest.cpp", "tests/DFPathRendererTest.cpp", "tests/DashPathEffectTest.cpp", "tests/DataRefTest.cpp",