diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-06-19 11:58:07 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-06-19 11:58:07 +0100 |
| commit | 7d4cd473f85ac64c3747c96c277f9e506a0d2246 (patch) | |
| tree | f5fecd524f5ac22cd38bcc6713b81f666730d5a1 /media/media.target.darwin-arm.mk | |
| parent | 84f2b2352908c30e40ae12ffe850dd8470f6c048 (diff) | |
| download | chromium_org-7d4cd473f85ac64c3747c96c277f9e506a0d2246.tar.gz | |
Merge from Chromium at DEPS revision r207203
This commit was generated by merge_to_master.py.
Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
Diffstat (limited to 'media/media.target.darwin-arm.mk')
| -rw-r--r-- | media/media.target.darwin-arm.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/media.target.darwin-arm.mk b/media/media.target.darwin-arm.mk index d1d2632d36..45551edf76 100644 --- a/media/media.target.darwin-arm.mk +++ b/media/media.target.darwin-arm.mk @@ -61,6 +61,7 @@ LOCAL_SRC_FILES := \ media/audio/virtual_audio_output_stream.cc \ media/base/android/demuxer_stream_player_params.cc \ media/base/android/media_resource_getter.cc \ + media/base/audio_buffer.cc \ media/base/audio_converter.cc \ media/base/audio_decoder.cc \ media/base/audio_decoder_config.cc \ @@ -95,6 +96,7 @@ LOCAL_SRC_FILES := \ media/base/pipeline.cc \ media/base/pipeline_status.cc \ media/base/ranges.cc \ + media/base/sample_format.cc \ media/base/seekable_buffer.cc \ media/base/serial_runner.cc \ media/base/simd/convert_rgb_to_yuv_c.cc \ @@ -196,6 +198,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ @@ -237,6 +240,8 @@ LOCAL_C_INCLUDES := \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH)/third_party/khronos \ + $(LOCAL_PATH)/gpu \ $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ $(LOCAL_PATH)/third_party/skia/include/config \ |