diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-09-26 13:24:57 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-09-26 13:24:57 +0100 |
| commit | 68043e1e95eeb07d5cae7aca370b26518b0867d6 (patch) | |
| tree | cc6a216bce6aa9319a216327b73a07f49200dab5 /media/media.target.darwin-arm.mk | |
| parent | cede44592cfb9ec370925d10c2df733349a94a82 (diff) | |
| download | chromium_org-68043e1e95eeb07d5cae7aca370b26518b0867d6.tar.gz | |
Merge from Chromium at DEPS revision 225410
This commit was generated by merge_to_master.py.
Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
Diffstat (limited to 'media/media.target.darwin-arm.mk')
| -rw-r--r-- | media/media.target.darwin-arm.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/media/media.target.darwin-arm.mk b/media/media.target.darwin-arm.mk index 7db549d7d5..f46a5399c0 100644 --- a/media/media.target.darwin-arm.mk +++ b/media/media.target.darwin-arm.mk @@ -159,6 +159,14 @@ LOCAL_SRC_FILES := \ media/webm/webm_video_client.cc \ media/webm/webm_webvtt_parser.cc \ media/base/media_stub.cc \ + media/mp2t/es_parser_adts.cc \ + media/mp2t/es_parser_h264.cc \ + media/mp2t/mp2t_stream_parser.cc \ + media/mp2t/ts_packet.cc \ + media/mp2t/ts_section_pat.cc \ + media/mp2t/ts_section_pes.cc \ + media/mp2t/ts_section_pmt.cc \ + media/mp2t/ts_section_psi.cc \ media/mp4/aac.cc \ media/mp4/avc.cc \ media/mp4/box_definitions.cc \ @@ -205,7 +213,6 @@ MY_CFLAGS_Debug := \ MY_DEFS_Debug := \ '-DANGLE_DX11' \ - '-DWTF_VECTOR_INITIAL_SIZE=4' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ @@ -225,8 +232,8 @@ MY_DEFS_Debug := \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ + '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_BUILD_FOR_ANDROID' \ - '-DUSE_CHROMIUM_SKIA' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DU_USING_ICU_NAMESPACE=0' \ @@ -319,7 +326,6 @@ MY_CFLAGS_Release := \ MY_DEFS_Release := \ '-DANGLE_DX11' \ - '-DWTF_VECTOR_INITIAL_SIZE=4' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ @@ -339,8 +345,8 @@ MY_DEFS_Release := \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ + '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_BUILD_FOR_ANDROID' \ - '-DUSE_CHROMIUM_SKIA' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DU_USING_ICU_NAMESPACE=0' \ |