diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-03 12:29:45 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-03 12:29:45 +0100 |
| commit | e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d (patch) | |
| tree | f266aab56db899073b21c1edd1d0e00055b9a2cf /media/media.target.darwin-mips.mk | |
| parent | 67e8dac6e410a019f58fc452b262a184e8e7fd12 (diff) | |
| download | chromium_org-e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d.tar.gz | |
Merge from Chromium at DEPS revision 261286
This commit was generated by merge_to_master.py.
Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
Diffstat (limited to 'media/media.target.darwin-mips.mk')
| -rw-r--r-- | media/media.target.darwin-mips.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/media.target.darwin-mips.mk b/media/media.target.darwin-mips.mk index a3fecf32e0..85c3162f1b 100644 --- a/media/media.target.darwin-mips.mk +++ b/media/media.target.darwin-mips.mk @@ -162,6 +162,7 @@ LOCAL_SRC_FILES := \ media/midi/usb_midi_input_stream.cc \ media/midi/usb_midi_output_stream.cc \ media/video/capture/android/video_capture_device_android.cc \ + media/video/capture/android/video_capture_device_factory_android.cc \ media/video/capture/fake_video_capture_device.cc \ media/video/capture/file_video_capture_device.cc \ media/video/capture/video_capture_device.cc \ @@ -248,6 +249,7 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ @@ -370,6 +372,7 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ |