diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-06-19 11:58:07 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-06-19 11:58:07 +0100 |
| commit | 7d4cd473f85ac64c3747c96c277f9e506a0d2246 (patch) | |
| tree | f5fecd524f5ac22cd38bcc6713b81f666730d5a1 /android_webview/android_webview_common.target.darwin-arm.mk | |
| parent | 84f2b2352908c30e40ae12ffe850dd8470f6c048 (diff) | |
| download | chromium_org-7d4cd473f85ac64c3747c96c277f9e506a0d2246.tar.gz | |
Merge from Chromium at DEPS revision r207203
This commit was generated by merge_to_master.py.
Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
Diffstat (limited to 'android_webview/android_webview_common.target.darwin-arm.mk')
| -rw-r--r-- | android_webview/android_webview_common.target.darwin-arm.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/android_webview/android_webview_common.target.darwin-arm.mk b/android_webview/android_webview_common.target.darwin-arm.mk index 348f4832e9..750223a962 100644 --- a/android_webview/android_webview_common.target.darwin-arm.mk +++ b/android_webview/android_webview_common.target.darwin-arm.mk @@ -43,7 +43,6 @@ LOCAL_SRC_FILES := \ android_webview/browser/aw_quota_permission_context.cc \ android_webview/browser/aw_pref_store.cc \ android_webview/browser/aw_request_interceptor.cc \ - android_webview/browser/browser_view_renderer_impl.cc \ android_webview/browser/find_helper.cc \ android_webview/browser/gpu_memory_buffer_impl.cc \ android_webview/browser/icon_helper.cc \ @@ -56,20 +55,17 @@ LOCAL_SRC_FILES := \ android_webview/browser/net/input_stream_reader.cc \ android_webview/browser/renderer_host/aw_render_view_host_ext.cc \ android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc \ - android_webview/browser/renderer_host/view_renderer_host.cc \ android_webview/common/android_webview_message_generator.cc \ android_webview/common/aw_content_client.cc \ android_webview/common/aw_hit_test_data.cc \ android_webview/common/aw_switches.cc \ android_webview/common/render_view_messages.cc \ - android_webview/common/renderer_picture_map.cc \ android_webview/common/url_constants.cc \ android_webview/lib/aw_browser_dependency_factory_impl.cc \ android_webview/lib/main/aw_main_delegate.cc \ android_webview/renderer/aw_content_renderer_client.cc \ android_webview/renderer/aw_render_process_observer.cc \ - android_webview/renderer/aw_render_view_ext.cc \ - android_webview/renderer/view_renderer.cc + android_webview/renderer/aw_render_view_ext.cc # Flags passed to both C and C++ files. @@ -108,6 +104,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ |