diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-15 12:16:31 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-05-15 12:16:31 +0100 |
| commit | 0de6073388f4e2780db8536178b129cd8f6ab386 (patch) | |
| tree | f22df67d2450c33e245fa27d50f001b403434315 /android_webview/native/webview_native.target.darwin-x86_64.mk | |
| parent | 237b4e8281feb4bb44a23557a97fcbbd55133d68 (diff) | |
| download | chromium_org-0de6073388f4e2780db8536178b129cd8f6ab386.tar.gz | |
Merge from Chromium at DEPS revision 269467
This commit was generated by merge_to_master.py.
Change-Id: Id6c03d44b5ad8b098017a943eb9ec8d804dfed99
Diffstat (limited to 'android_webview/native/webview_native.target.darwin-x86_64.mk')
| -rw-r--r-- | android_webview/native/webview_native.target.darwin-x86_64.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/android_webview/native/webview_native.target.darwin-x86_64.mk b/android_webview/native/webview_native.target.darwin-x86_64.mk index f5fbc6c5a5..8d47519ad5 100644 --- a/android_webview/native/webview_native.target.darwin-x86_64.mk +++ b/android_webview/native/webview_native.target.darwin-x86_64.mk @@ -58,7 +58,8 @@ LOCAL_SRC_FILES := \ android_webview/native/permission/media_access_permission_request.cc \ android_webview/native/permission/permission_request_handler.cc \ android_webview/native/permission/permission_request_handler_client.cc \ - android_webview/native/state_serializer.cc + android_webview/native/state_serializer.cc \ + android_webview/native/external_video_surface_container_impl.cc # Flags passed to both C and C++ files. @@ -113,6 +114,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DMOJO_USE_SYSTEM_IMPL' \ '-DPOSIX_AVOID_MMAP' \ '-DSK_ENABLE_INST_COUNT=0' \ @@ -240,6 +242,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DMOJO_USE_SYSTEM_IMPL' \ '-DPOSIX_AVOID_MMAP' \ '-DSK_ENABLE_INST_COUNT=0' \ |