| commit | fb250657ef40d7500f20882d5c9909c1013367d3 | [log] [tgz] |
|---|---|---|
| author | Ben Murdoch <benm@google.com> | Wed Jul 31 11:42:55 2013 +0100 |
| committer | Ben Murdoch <benm@google.com> | Wed Jul 31 11:42:55 2013 +0100 |
| tree | e7885d8f55b77d8ec4430fa4ec78add75c7270d8 | |
| parent | 8b098b9dd9d1242c3db3032622b35d8469d47ac4 [diff] [blame] |
Merge from Chromium at DEPS revision r214456 This commit was generated by merge_to_master.py. Change-Id: If3f38c7966c2034e96c669968f72ea1e57f41964
diff --git a/skia/skia_chrome.target.darwin-arm.mk b/skia/skia_chrome.target.darwin-arm.mk index 6683c6f..f5c66a3 100644 --- a/skia/skia_chrome.target.darwin-arm.mk +++ b/skia/skia_chrome.target.darwin-arm.mk
@@ -29,6 +29,7 @@ LOCAL_SRC_FILES := \ skia/ext/analysis_canvas.cc \ + skia/ext/benchmarking_canvas.cc \ skia/ext/bitmap_platform_device_android.cc \ skia/ext/convolver.cc \ skia/ext/google_logging.cc \