diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-09 12:00:27 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-09 12:00:27 +0100 |
| commit | 46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd (patch) | |
| tree | ed52337c337f5fd1db77873d9ff980ca3e334b35 /media/media.target.darwin-arm.mk | |
| parent | 7ef4c70daab901f557268ad466f62cd2f7896916 (diff) | |
| download | chromium_org-46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd.tar.gz | |
Merge from Chromium at DEPS revision 275586
This commit was generated by merge_to_master.py.
Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
Diffstat (limited to 'media/media.target.darwin-arm.mk')
| -rw-r--r-- | media/media.target.darwin-arm.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/media/media.target.darwin-arm.mk b/media/media.target.darwin-arm.mk index 77877e0138..d4f5832f24 100644 --- a/media/media.target.darwin-arm.mk +++ b/media/media.target.darwin-arm.mk @@ -103,6 +103,7 @@ LOCAL_SRC_FILES := \ media/base/media_switches.cc \ media/base/multi_channel_resampler.cc \ media/base/pipeline.cc \ + media/base/player_tracker.cc \ media/base/ranges.cc \ media/base/sample_format.cc \ media/base/seekable_buffer.cc \ @@ -129,6 +130,7 @@ LOCAL_SRC_FILES := \ media/cdm/aes_decryptor.cc \ media/cdm/json_web_key.cc \ media/cdm/key_system_names.cc \ + media/cdm/player_tracker_impl.cc \ media/filters/audio_clock.cc \ media/filters/audio_renderer_algorithm.cc \ media/filters/audio_renderer_impl.cc \ @@ -267,7 +269,6 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ - '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ @@ -289,11 +290,11 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ - '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ + '-DSK_SUPPORT_LEGACY_SETCONFIG_INFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_IGNORE_ETC1_SUPPORT' \ '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ - '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ + '-DSK_SUPPORT_LEGACY_DRAWPICTURE_API' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -407,7 +408,6 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ - '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ @@ -429,11 +429,11 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ - '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ + '-DSK_SUPPORT_LEGACY_SETCONFIG_INFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_IGNORE_ETC1_SUPPORT' \ '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ - '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ + '-DSK_SUPPORT_LEGACY_DRAWPICTURE_API' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ |