diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-06-11 10:57:03 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-06-11 10:57:03 +0100 |
| commit | 868fa2fe829687343ffae624259930155e16dbd8 (patch) | |
| tree | 54d316199dd9739c57c3aacd131853bbd6554a94 /android_webview/android_webview_common.target.darwin-arm.mk | |
| parent | bb1bdbd796f966b5bf11f40ecbea12621c7bfac9 (diff) | |
| download | chromium_org-868fa2fe829687343ffae624259930155e16dbd8.tar.gz | |
Merge from Chromium at DEPS revision r205460
This commit was generated by merge_to_master.py.
Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
Diffstat (limited to 'android_webview/android_webview_common.target.darwin-arm.mk')
| -rw-r--r-- | android_webview/android_webview_common.target.darwin-arm.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/android_webview/android_webview_common.target.darwin-arm.mk b/android_webview/android_webview_common.target.darwin-arm.mk index 6acea70298..348f4832e9 100644 --- a/android_webview/android_webview_common.target.darwin-arm.mk +++ b/android_webview/android_webview_common.target.darwin-arm.mk @@ -46,9 +46,8 @@ LOCAL_SRC_FILES := \ 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/in_process_renderer/in_process_renderer_client.cc \ - android_webview/browser/in_process_renderer/in_process_view_renderer.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 \ android_webview/browser/net/aw_network_delegate.cc \ android_webview/browser/net/aw_url_request_context_getter.cc \ @@ -114,7 +113,6 @@ MY_DEFS := \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ - '-DENABLE_DOUBLE_RESOURCE_LOAD_TIMING' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_GPU=1' \ @@ -164,7 +162,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/third_party/skia/include/utils \ $(LOCAL_PATH)/skia/ext \ $(gyp_shared_intermediate_dir)/ui/gl \ - $(LOCAL_PATH)/third_party/mesa/MesaLib/include \ + $(LOCAL_PATH)/third_party/mesa/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport |