diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-20 14:52:04 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-20 14:52:04 +0100 |
| commit | f8ee788a64d60abd8f2d742a5fdedde054ecd910 (patch) | |
| tree | 7dc14380200b953c64e0ccd16435cdbd1dbf1205 /media/player_android.target.linux-x86.mk | |
| parent | fcbbbe23a38088a52492922075e71a419c4b01ec (diff) | |
| download | chromium_org-f8ee788a64d60abd8f2d742a5fdedde054ecd910.tar.gz | |
Merge from Chromium at DEPS revision 278205
This commit was generated by merge_to_master.py.
Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
Diffstat (limited to 'media/player_android.target.linux-x86.mk')
| -rw-r--r-- | media/player_android.target.linux-x86.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/player_android.target.linux-x86.mk b/media/player_android.target.linux-x86.mk index 52389a70e7..b6c6f813e5 100644 --- a/media/player_android.target.linux-x86.mk +++ b/media/player_android.target.linux-x86.mk @@ -38,8 +38,7 @@ LOCAL_SRC_FILES := \ media/base/android/media_player_listener.cc \ media/base/android/media_source_player.cc \ media/base/android/video_decoder_job.cc \ - media/base/android/webaudio_media_codec_bridge.cc \ - media/base/browser_cdm.cc + media/base/android/webaudio_media_codec_bridge.cc # Flags passed to both C and C++ files. @@ -88,6 +87,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -190,6 +190,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ |