| commit | 3c15a3789a92adebb3a63e39eea8673b5ab01e93 | [log] [tgz] |
|---|---|---|
| author | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Wed Jan 18 18:05:37 2017 +0000 |
| committer | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Wed Jan 18 18:05:37 2017 +0000 |
| tree | f1dea91ffaa775e53ec29538b7ea8b84e8a51632 | |
| parent | 6f2c8d4010932fce672dd233beb7204f8e5fd981 [diff] [blame] | |
| parent | 0831f1b5f112f4e95532695dd701676f734cde54 [diff] [blame] |
Merge latest Skia into master (2 commits) https://skia.googlesource.com/skia.git/+log/70a309a..0831f1b Test: Presubmit checks will test this change. Change-Id: I68f06ec39c19a6c7f81637d937cfec501ab6dcc8
diff --git a/Android.bp b/Android.bp index daaccac..aa98366 100644 --- a/Android.bp +++ b/Android.bp
@@ -404,6 +404,7 @@ "src/gpu/GrPrimitiveProcessor.cpp", "src/gpu/GrProcOptInfo.cpp", "src/gpu/GrProcessor.cpp", + "src/gpu/GrProcessorSet.cpp", "src/gpu/GrProcessorUnitTest.cpp", "src/gpu/GrProgramDesc.cpp", "src/gpu/GrRectanizer_pow2.cpp",