diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-24 18:04:36 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-24 18:04:36 +0000 |
| commit | c05a4d5b9e9e2f5438c42531d64fedf26d4d7026 (patch) | |
| tree | e8f4e2bcf0196966e3c0ce0323d5c05acb06bcc2 | |
| parent | 6b8ab5a46e74662b6c7c9af1f871b5bdbc826e54 (diff) | |
| download | libvpx-c05a4d5b9e9e2f5438c42531d64fedf26d4d7026.tar.gz | |
Update makefiles after merge of Chromium at d3db2ff38e13
This commit was generated by merge_from_chromium.py.
Change-Id: I59621bac3f32af80f2dbe44f2de406af91a34190
| -rw-r--r-- | libvpx.target.darwin-arm.mk | 1 | ||||
| -rw-r--r-- | libvpx.target.darwin-arm64.mk | 1 | ||||
| -rw-r--r-- | libvpx.target.darwin-mips.mk | 1 | ||||
| -rw-r--r-- | libvpx.target.darwin-x86.mk | 1 | ||||
| -rw-r--r-- | libvpx.target.darwin-x86_64.mk | 1 | ||||
| -rw-r--r-- | libvpx.target.linux-arm.mk | 1 | ||||
| -rw-r--r-- | libvpx.target.linux-arm64.mk | 1 | ||||
| -rw-r--r-- | libvpx.target.linux-mips.mk | 1 | ||||
| -rw-r--r-- | libvpx.target.linux-x86.mk | 1 | ||||
| -rw-r--r-- | libvpx.target.linux-x86_64.mk | 1 | ||||
| -rw-r--r-- | libvpx_intrinsics_sse2.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | libvpx_intrinsics_sse2.target.darwin-x86_64.mk | 2 | ||||
| -rw-r--r-- | libvpx_intrinsics_sse2.target.linux-x86.mk | 2 | ||||
| -rw-r--r-- | libvpx_intrinsics_sse2.target.linux-x86_64.mk | 2 |
14 files changed, 18 insertions, 0 deletions
diff --git a/libvpx.target.darwin-arm.mk b/libvpx.target.darwin-arm.mk index 5e14263..8eb8acc 100644 --- a/libvpx.target.darwin-arm.mk +++ b/libvpx.target.darwin-arm.mk @@ -745,6 +745,7 @@ LOCAL_SRC_FILES := \ 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 \ + third_party/libvpx/source/libvpx/vp9/encoder/vp9_avg.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_context_tree.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_cost.c \ diff --git a/libvpx.target.darwin-arm64.mk b/libvpx.target.darwin-arm64.mk index 0d7716e..9870e5e 100644 --- a/libvpx.target.darwin-arm64.mk +++ b/libvpx.target.darwin-arm64.mk @@ -155,6 +155,7 @@ LOCAL_SRC_FILES := \ 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 \ + third_party/libvpx/source/libvpx/vp9/encoder/vp9_avg.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_context_tree.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_cost.c \ diff --git a/libvpx.target.darwin-mips.mk b/libvpx.target.darwin-mips.mk index 9efd5fe..1ea1596 100644 --- a/libvpx.target.darwin-mips.mk +++ b/libvpx.target.darwin-mips.mk @@ -121,6 +121,7 @@ LOCAL_SRC_FILES := \ 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 \ + third_party/libvpx/source/libvpx/vp9/encoder/vp9_avg.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_context_tree.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_cost.c \ diff --git a/libvpx.target.darwin-x86.mk b/libvpx.target.darwin-x86.mk index 5826b7d..0ca5137 100644 --- a/libvpx.target.darwin-x86.mk +++ b/libvpx.target.darwin-x86.mk @@ -678,6 +678,7 @@ LOCAL_SRC_FILES := \ 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 \ + third_party/libvpx/source/libvpx/vp9/encoder/vp9_avg.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_context_tree.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_cost.c \ diff --git a/libvpx.target.darwin-x86_64.mk b/libvpx.target.darwin-x86_64.mk index 0b1d706..74541a5 100644 --- a/libvpx.target.darwin-x86_64.mk +++ b/libvpx.target.darwin-x86_64.mk @@ -744,6 +744,7 @@ LOCAL_SRC_FILES := \ 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 \ + third_party/libvpx/source/libvpx/vp9/encoder/vp9_avg.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_context_tree.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_cost.c \ diff --git a/libvpx.target.linux-arm.mk b/libvpx.target.linux-arm.mk index 5e14263..8eb8acc 100644 --- a/libvpx.target.linux-arm.mk +++ b/libvpx.target.linux-arm.mk @@ -745,6 +745,7 @@ LOCAL_SRC_FILES := \ 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 \ + third_party/libvpx/source/libvpx/vp9/encoder/vp9_avg.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_context_tree.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_cost.c \ diff --git a/libvpx.target.linux-arm64.mk b/libvpx.target.linux-arm64.mk index 0d7716e..9870e5e 100644 --- a/libvpx.target.linux-arm64.mk +++ b/libvpx.target.linux-arm64.mk @@ -155,6 +155,7 @@ LOCAL_SRC_FILES := \ 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 \ + third_party/libvpx/source/libvpx/vp9/encoder/vp9_avg.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_context_tree.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_cost.c \ diff --git a/libvpx.target.linux-mips.mk b/libvpx.target.linux-mips.mk index 9efd5fe..1ea1596 100644 --- a/libvpx.target.linux-mips.mk +++ b/libvpx.target.linux-mips.mk @@ -121,6 +121,7 @@ LOCAL_SRC_FILES := \ 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 \ + third_party/libvpx/source/libvpx/vp9/encoder/vp9_avg.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_context_tree.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_cost.c \ diff --git a/libvpx.target.linux-x86.mk b/libvpx.target.linux-x86.mk index 5826b7d..0ca5137 100644 --- a/libvpx.target.linux-x86.mk +++ b/libvpx.target.linux-x86.mk @@ -678,6 +678,7 @@ LOCAL_SRC_FILES := \ 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 \ + third_party/libvpx/source/libvpx/vp9/encoder/vp9_avg.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_context_tree.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_cost.c \ diff --git a/libvpx.target.linux-x86_64.mk b/libvpx.target.linux-x86_64.mk index 0b1d706..74541a5 100644 --- a/libvpx.target.linux-x86_64.mk +++ b/libvpx.target.linux-x86_64.mk @@ -744,6 +744,7 @@ LOCAL_SRC_FILES := \ 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 \ + third_party/libvpx/source/libvpx/vp9/encoder/vp9_avg.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_context_tree.c \ third_party/libvpx/source/libvpx/vp9/encoder/vp9_cost.c \ diff --git a/libvpx_intrinsics_sse2.target.darwin-x86.mk b/libvpx_intrinsics_sse2.target.darwin-x86.mk index 619fd1e..8013b9d 100644 --- a/libvpx_intrinsics_sse2.target.darwin-x86.mk +++ b/libvpx_intrinsics_sse2.target.darwin-x86.mk @@ -31,8 +31,10 @@ LOCAL_SRC_FILES := \ third_party/libvpx/source/libvpx/vp8/encoder/x86/vp8_enc_stubs_sse2.c \ third_party/libvpx/source/libvpx/vp9/common/x86/vp9_idct_intrin_sse2.c \ third_party/libvpx/source/libvpx/vp9/common/x86/vp9_loopfilter_intrin_sse2.c \ + third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_avg_intrin_sse2.c \ third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct32x32_sse2.c \ third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct_sse2.c \ + third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_quantize_sse2.c \ third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_variance_sse2.c diff --git a/libvpx_intrinsics_sse2.target.darwin-x86_64.mk b/libvpx_intrinsics_sse2.target.darwin-x86_64.mk index 5a28819..1b85359 100644 --- a/libvpx_intrinsics_sse2.target.darwin-x86_64.mk +++ b/libvpx_intrinsics_sse2.target.darwin-x86_64.mk @@ -31,8 +31,10 @@ LOCAL_SRC_FILES := \ third_party/libvpx/source/libvpx/vp8/encoder/x86/vp8_enc_stubs_sse2.c \ third_party/libvpx/source/libvpx/vp9/common/x86/vp9_idct_intrin_sse2.c \ third_party/libvpx/source/libvpx/vp9/common/x86/vp9_loopfilter_intrin_sse2.c \ + third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_avg_intrin_sse2.c \ third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct32x32_sse2.c \ third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct_sse2.c \ + third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_quantize_sse2.c \ third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_variance_sse2.c diff --git a/libvpx_intrinsics_sse2.target.linux-x86.mk b/libvpx_intrinsics_sse2.target.linux-x86.mk index 619fd1e..8013b9d 100644 --- a/libvpx_intrinsics_sse2.target.linux-x86.mk +++ b/libvpx_intrinsics_sse2.target.linux-x86.mk @@ -31,8 +31,10 @@ LOCAL_SRC_FILES := \ third_party/libvpx/source/libvpx/vp8/encoder/x86/vp8_enc_stubs_sse2.c \ third_party/libvpx/source/libvpx/vp9/common/x86/vp9_idct_intrin_sse2.c \ third_party/libvpx/source/libvpx/vp9/common/x86/vp9_loopfilter_intrin_sse2.c \ + third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_avg_intrin_sse2.c \ third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct32x32_sse2.c \ third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct_sse2.c \ + third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_quantize_sse2.c \ third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_variance_sse2.c diff --git a/libvpx_intrinsics_sse2.target.linux-x86_64.mk b/libvpx_intrinsics_sse2.target.linux-x86_64.mk index 5a28819..1b85359 100644 --- a/libvpx_intrinsics_sse2.target.linux-x86_64.mk +++ b/libvpx_intrinsics_sse2.target.linux-x86_64.mk @@ -31,8 +31,10 @@ LOCAL_SRC_FILES := \ third_party/libvpx/source/libvpx/vp8/encoder/x86/vp8_enc_stubs_sse2.c \ third_party/libvpx/source/libvpx/vp9/common/x86/vp9_idct_intrin_sse2.c \ third_party/libvpx/source/libvpx/vp9/common/x86/vp9_loopfilter_intrin_sse2.c \ + third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_avg_intrin_sse2.c \ third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct32x32_sse2.c \ third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct_sse2.c \ + third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_quantize_sse2.c \ third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_variance_sse2.c |