diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-03-18 10:20:56 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-03-18 10:20:56 +0000 |
| commit | a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 (patch) | |
| tree | 3437151d9ae1ce20a1e53a0d98c19ca01c786394 /media/media.target.darwin-arm.mk | |
| parent | af5066f1e36c6579e74752647e6c584438f80f94 (diff) | |
| download | chromium_org-a1401311d1ab56c4ed0a474bd38c108f75cb0cd9.tar.gz | |
Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py.
Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
Diffstat (limited to 'media/media.target.darwin-arm.mk')
| -rw-r--r-- | media/media.target.darwin-arm.mk | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/media/media.target.darwin-arm.mk b/media/media.target.darwin-arm.mk index 5750241570..66d93e713e 100644 --- a/media/media.target.darwin-arm.mk +++ b/media/media.target.darwin-arm.mk @@ -130,21 +130,24 @@ LOCAL_SRC_FILES := \ media/filters/audio_renderer_impl.cc \ media/filters/chunk_demuxer.cc \ media/filters/decoder_selector.cc \ + media/filters/decoder_stream.cc \ + media/filters/decoder_stream_traits.cc \ media/filters/decrypting_audio_decoder.cc \ media/filters/decrypting_demuxer_stream.cc \ media/filters/decrypting_video_decoder.cc \ media/filters/file_data_source.cc \ + media/filters/frame_processor_base.cc \ media/filters/gpu_video_accelerator_factories.cc \ media/filters/gpu_video_decoder.cc \ media/filters/h264_bit_reader.cc \ media/filters/h264_parser.cc \ media/filters/h264_to_annex_b_bitstream_converter.cc \ media/filters/in_memory_url_protocol.cc \ + media/filters/legacy_frame_processor.cc \ media/filters/skcanvas_video_renderer.cc \ media/filters/source_buffer_stream.cc \ media/filters/stream_parser_factory.cc \ media/filters/video_frame_painter.cc \ - media/filters/video_frame_stream.cc \ media/filters/video_renderer_impl.cc \ media/filters/wsola_internals.cc \ media/midi/midi_manager.cc \ @@ -240,6 +243,7 @@ MY_CFLAGS_Debug := \ MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -247,9 +251,9 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ @@ -262,12 +266,18 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ + '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ + '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ + '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ + '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DU_USING_ICU_NAMESPACE=0' \ + '-DUSE_OPENSSL=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -357,6 +367,7 @@ MY_CFLAGS_Release := \ MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -364,9 +375,9 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ @@ -379,12 +390,18 @@ MY_DEFS_Release := \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ + '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ + '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ + '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ + '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DU_USING_ICU_NAMESPACE=0' \ + '-DUSE_OPENSSL=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -441,9 +458,11 @@ LOCAL_CPPFLAGS_Release := \ LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) +LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -455,7 +474,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--fatal-warnings \ -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ @@ -463,6 +481,7 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -477,7 +496,6 @@ LOCAL_LDFLAGS_Release := \ -Wl,-O1 \ -Wl,--as-needed \ -Wl,--gc-sections \ - -Wl,--fatal-warnings \ -Wl,--warn-shared-textrel |