diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-09 12:00:27 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-09 12:00:27 +0100 |
| commit | 46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd (patch) | |
| tree | ed52337c337f5fd1db77873d9ff980ca3e334b35 /android_webview/android_webview_common.target.darwin-arm.mk | |
| parent | 7ef4c70daab901f557268ad466f62cd2f7896916 (diff) | |
| download | chromium_org-46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd.tar.gz | |
Merge from Chromium at DEPS revision 275586
This commit was generated by merge_to_master.py.
Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
Diffstat (limited to 'android_webview/android_webview_common.target.darwin-arm.mk')
| -rw-r--r-- | android_webview/android_webview_common.target.darwin-arm.mk | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/android_webview/android_webview_common.target.darwin-arm.mk b/android_webview/android_webview_common.target.darwin-arm.mk index 76ed906cdf..064f1c3cff 100644 --- a/android_webview/android_webview_common.target.darwin-arm.mk +++ b/android_webview/android_webview_common.target.darwin-arm.mk @@ -80,11 +80,11 @@ LOCAL_SRC_FILES := \ android_webview/renderer/aw_content_renderer_client.cc \ android_webview/renderer/aw_key_systems.cc \ android_webview/renderer/aw_permission_client.cc \ - android_webview/renderer/aw_render_frame_observer.cc \ android_webview/renderer/aw_render_process_observer.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 + android_webview/renderer/print_web_view_helper_android.cc \ + android_webview/renderer/print_render_frame_observer.cc # Flags passed to both C and C++ files. @@ -139,7 +139,6 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ - '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ @@ -162,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_ASIMAGEINFO' \ + '-DSK_SUPPORT_LEGACY_SETCONFIG_INFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_IGNORE_ETC1_SUPPORT' \ '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ - '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ + '-DSK_SUPPORT_LEGACY_DRAWPICTURE_API' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -297,7 +296,6 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ - '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ @@ -320,11 +318,11 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ - '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ + '-DSK_SUPPORT_LEGACY_SETCONFIG_INFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_IGNORE_ETC1_SUPPORT' \ '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ - '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ + '-DSK_SUPPORT_LEGACY_DRAWPICTURE_API' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ |