| commit | 555b343d03110e3bc0c4b4344b7da447be0f2a9f | [log] [tgz] |
|---|---|---|
| author | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Wed Sep 21 21:04:31 2016 +0000 |
| committer | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Wed Sep 21 21:04:31 2016 +0000 |
| tree | cfecb846090d6ed655a1ae8c4da7347538a5bf27 | |
| parent | 06dad43121953641f98e5697f9f9130aed01a735 [diff] [blame] | |
| parent | 605d95289379a07aad50b38ca6badbee45813d56 [diff] [blame] |
Merge "GN: take over CommandBuffer bot" into master-skia https://skia.googlesource.com/skia/+/605d95289379a07aad50b38ca6badbee45813d56 Change-Id: Ifdb4e59a1e85c83d654e5772f2f49931746956d9
diff --git a/bench/Android.mk b/bench/Android.mk index f772750..f715ba3 100644 --- a/bench/Android.mk +++ b/bench/Android.mk
@@ -476,6 +476,7 @@ ../tools/gpu/GrTest.cpp \ ../tools/gpu/TestContext.cpp \ ../tools/gpu/gl/GLTestContext.cpp \ + ../tools/gpu/gl/command_buffer/GLTestContext_command_buffer.cpp \ ../tools/gpu/gl/debug/DebugGLTestContext.cpp \ ../tools/gpu/gl/debug/GrBufferObj.cpp \ ../tools/gpu/gl/debug/GrFrameBufferObj.cpp \