Update makefiles after merge of Chromium at d3db2ff38e13
This commit was generated by merge_from_chromium.py.
Change-Id: I59621bac3f32af80f2dbe44f2de406af91a34190
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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
