diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-05-13 16:52:09 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-05-13 16:52:09 +0100 |
| commit | b2df76ea8fec9e32f6f3718986dba0d95315b29c (patch) | |
| tree | 0182623e854b794f7307829abf4be16435a0193a /media/player_android.target.linux-arm.mk | |
| parent | 121d6d4bf5931d9b1dbc0b9a262f6c609440f6c7 (diff) | |
| download | chromium_org-b2df76ea8fec9e32f6f3718986dba0d95315b29c.tar.gz | |
Merge from Chromium at DEPS revision r199464
This commit was generated by merge_to_master.py.
Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
Diffstat (limited to 'media/player_android.target.linux-arm.mk')
| -rw-r--r-- | media/player_android.target.linux-arm.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/player_android.target.linux-arm.mk b/media/player_android.target.linux-arm.mk index 104141b48e..2553e9f805 100644 --- a/media/player_android.target.linux-arm.mk +++ b/media/player_android.target.linux-arm.mk @@ -28,6 +28,7 @@ GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ media/base/android/media_codec_bridge.cc \ media/base/android/media_jni_registrar.cc \ + media/base/android/media_player_android.cc \ media/base/android/media_player_bridge.cc \ media/base/android/media_player_listener.cc \ media/base/android/webaudio_media_codec_bridge.cc |