From 7d4cd473f85ac64c3747c96c277f9e506a0d2246 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Wed, 19 Jun 2013 11:58:07 +0100 Subject: Merge from Chromium at DEPS revision r207203 This commit was generated by merge_to_master.py. Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418 --- media/media.target.darwin-mips.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'media/media.target.darwin-mips.mk') diff --git a/media/media.target.darwin-mips.mk b/media/media.target.darwin-mips.mk index 4a70a1ab08..59826ab55a 100644 --- a/media/media.target.darwin-mips.mk +++ b/media/media.target.darwin-mips.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 \ @@ -198,6 +200,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -238,6 +241,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 \ -- cgit v1.2.3