diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-20 14:52:04 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-20 14:52:04 +0100 |
| commit | f8ee788a64d60abd8f2d742a5fdedde054ecd910 (patch) | |
| tree | 7dc14380200b953c64e0ccd16435cdbd1dbf1205 /android_webview/android_webview_common.target.darwin-arm.mk | |
| parent | fcbbbe23a38088a52492922075e71a419c4b01ec (diff) | |
| download | chromium_org-f8ee788a64d60abd8f2d742a5fdedde054ecd910.tar.gz | |
Merge from Chromium at DEPS revision 278205
This commit was generated by merge_to_master.py.
Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
Diffstat (limited to 'android_webview/android_webview_common.target.darwin-arm.mk')
| -rw-r--r-- | android_webview/android_webview_common.target.darwin-arm.mk | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/android_webview/android_webview_common.target.darwin-arm.mk b/android_webview/android_webview_common.target.darwin-arm.mk index 064f1c3cff..b7c23c9cd3 100644 --- a/android_webview/android_webview_common.target.darwin-arm.mk +++ b/android_webview/android_webview_common.target.darwin-arm.mk @@ -52,7 +52,6 @@ LOCAL_SRC_FILES := \ android_webview/browser/global_tile_manager.cc \ android_webview/browser/gpu_memory_buffer_factory_impl.cc \ android_webview/browser/hardware_renderer.cc \ - android_webview/browser/hardware_renderer_legacy.cc \ android_webview/browser/icon_helper.cc \ android_webview/browser/intercepted_request_data.cc \ android_webview/browser/gl_view_renderer_manager.cc \ @@ -71,7 +70,6 @@ LOCAL_SRC_FILES := \ 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/print_messages.cc \ android_webview/common/render_view_messages.cc \ android_webview/common/url_constants.cc \ @@ -81,6 +79,7 @@ LOCAL_SRC_FILES := \ android_webview/renderer/aw_key_systems.cc \ android_webview/renderer/aw_permission_client.cc \ android_webview/renderer/aw_render_process_observer.cc \ + android_webview/renderer/aw_render_frame_ext.cc \ android_webview/renderer/aw_render_view_ext.cc \ android_webview/renderer/print_web_view_helper.cc \ android_webview/renderer/print_web_view_helper_android.cc \ @@ -138,6 +137,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -161,11 +161,11 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ - '-DSK_SUPPORT_LEGACY_SETCONFIG_INFO' \ + '-DSK_SUPPORT_LEGACY_BITMAP_CONFIG' \ + '-DSK_SUPPORT_LEGACY_DEVICE_VIRTUAL_ISOPAQUE' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_SETCONFIG' \ '-DSK_IGNORE_ETC1_SUPPORT' \ - '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ - '-DSK_SUPPORT_LEGACY_DRAWPICTURE_API' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -195,6 +195,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/skia/config \ $(gyp_shared_intermediate_dir)/ui/ui_resources \ @@ -295,6 +296,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -318,11 +320,11 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ - '-DSK_SUPPORT_LEGACY_SETCONFIG_INFO' \ + '-DSK_SUPPORT_LEGACY_BITMAP_CONFIG' \ + '-DSK_SUPPORT_LEGACY_DEVICE_VIRTUAL_ISOPAQUE' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_SETCONFIG' \ '-DSK_IGNORE_ETC1_SUPPORT' \ - '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ - '-DSK_SUPPORT_LEGACY_DRAWPICTURE_API' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -353,6 +355,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/skia/config \ $(gyp_shared_intermediate_dir)/ui/ui_resources \ |