diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-30 15:19:42 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-30 15:19:42 +0100 |
| commit | 558790d6acca3451cf3a6b497803a5f07d0bec58 (patch) | |
| tree | fcc36c3da74559ee6015cb5e9f596105cdc9f56e /android_webview/android_webview_common.target.darwin-arm.mk | |
| parent | 8643c35ec8e6546ae6e04c51e08c4d57d40e88da (diff) | |
| download | chromium_org-558790d6acca3451cf3a6b497803a5f07d0bec58.tar.gz | |
Merge from Chromium at DEPS revision r214332
This commit was generated by merge_to_master.py.
Change-Id: I82a7c38de906244dc882493568013be659aa65d1
Diffstat (limited to 'android_webview/android_webview_common.target.darwin-arm.mk')
| -rw-r--r-- | android_webview/android_webview_common.target.darwin-arm.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/android_webview/android_webview_common.target.darwin-arm.mk b/android_webview/android_webview_common.target.darwin-arm.mk index eeffccfe6a..59687f0ec2 100644 --- a/android_webview/android_webview_common.target.darwin-arm.mk +++ b/android_webview/android_webview_common.target.darwin-arm.mk @@ -44,7 +44,7 @@ LOCAL_SRC_FILES := \ android_webview/browser/aw_pref_store.cc \ android_webview/browser/aw_request_interceptor.cc \ android_webview/browser/find_helper.cc \ - android_webview/browser/gpu_memory_buffer_impl.cc \ + android_webview/browser/gpu_memory_buffer_factory_impl.cc \ android_webview/browser/icon_helper.cc \ android_webview/browser/in_process_view_renderer.cc \ android_webview/browser/net/android_stream_reader_url_request_job.cc \ @@ -123,6 +123,7 @@ MY_DEFS_Debug := \ '-DSK_BUILD_FOR_ANDROID' \ '-DUSE_CHROMIUM_SKIA' \ '-DSK_USE_POSIX_THREADS' \ + '-DMESA_EGL_NO_X11_HEADERS' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -231,6 +232,7 @@ MY_DEFS_Release := \ '-DSK_BUILD_FOR_ANDROID' \ '-DUSE_CHROMIUM_SKIA' \ '-DSK_USE_POSIX_THREADS' \ + '-DMESA_EGL_NO_X11_HEADERS' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ |