diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-07-13 21:43:43 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-07-13 21:43:43 +0000 |
| commit | 85d3a42cb4f1b5922b491b14dded06e0d8f29a35 (patch) | |
| tree | 7d1380b70b71fba7d90f6fbda35e16121258fa0c /libvpx.target.linux-x86_64.mk | |
| parent | 6905d79cb8bfa5fda126ed1383511416315e785e (diff) | |
| download | libvpx-85d3a42cb4f1b5922b491b14dded06e0d8f29a35.tar.gz | |
Update makefiles after merge of Chromium at 282880
This commit was generated by merge_from_chromium.py.
Change-Id: I2bd8050a96748cff68c20e389ea4479201e514ee
Diffstat (limited to 'libvpx.target.linux-x86_64.mk')
| -rw-r--r-- | libvpx.target.linux-x86_64.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvpx.target.linux-x86_64.mk b/libvpx.target.linux-x86_64.mk index 3ad24f1..70885c4 100644 --- a/libvpx.target.linux-x86_64.mk +++ b/libvpx.target.linux-x86_64.mk @@ -763,6 +763,7 @@ LOCAL_SRC_FILES := \ third_party/libvpx/source/libvpx/vp9/common/vp9_scale.c \ third_party/libvpx/source/libvpx/vp9/common/vp9_scan.c \ third_party/libvpx/source/libvpx/vp9/common/vp9_seg_common.c \ + third_party/libvpx/source/libvpx/vp9/common/vp9_thread.c \ third_party/libvpx/source/libvpx/vp9/common/vp9_tile_common.c \ third_party/libvpx/source/libvpx/vp9/common/x86/vp9_asm_stubs.c \ third_party/libvpx/source/libvpx/vp9/decoder/vp9_decodeframe.c \ @@ -773,7 +774,6 @@ LOCAL_SRC_FILES := \ third_party/libvpx/source/libvpx/vp9/decoder/vp9_dthread.c \ third_party/libvpx/source/libvpx/vp9/decoder/vp9_read_bit_buffer.c \ third_party/libvpx/source/libvpx/vp9/decoder/vp9_reader.c \ - third_party/libvpx/source/libvpx/vp9/decoder/vp9_thread.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_aq_complexity.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_aq_cyclicrefresh.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_aq_variance.c \ |