diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-24 10:50:13 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-24 10:50:13 +0100 |
| commit | 0529e5d033099cbfc42635f6f6183833b09dff6e (patch) | |
| tree | badea60062e611382d8a37e3b0bfda8d69760c2b /media/media.target.darwin-arm.mk | |
| parent | 8346740f6fb555ccbb9b4148ab63402ae8f6e4ca (diff) | |
| download | chromium_org-0529e5d033099cbfc42635f6f6183833b09dff6e.tar.gz | |
Merge from Chromium at DEPS revision 265802
This commit was generated by merge_to_master.py.
Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
Diffstat (limited to 'media/media.target.darwin-arm.mk')
| -rw-r--r-- | media/media.target.darwin-arm.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/media/media.target.darwin-arm.mk b/media/media.target.darwin-arm.mk index 5457708b22..8b71e8db46 100644 --- a/media/media.target.darwin-arm.mk +++ b/media/media.target.darwin-arm.mk @@ -149,6 +149,8 @@ LOCAL_SRC_FILES := \ media/filters/skcanvas_video_renderer.cc \ media/filters/source_buffer_stream.cc \ media/filters/stream_parser_factory.cc \ + media/filters/video_frame_scheduler_impl.cc \ + media/filters/video_frame_scheduler_proxy.cc \ media/filters/video_renderer_impl.cc \ media/filters/wsola_internals.cc \ media/midi/midi_manager.cc \ @@ -272,12 +274,15 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -397,12 +402,15 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ + '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -478,7 +486,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed |