Move libvpx_new to libvpx

third_party/libvpx/BUILD.gn

Index: third_party/libvpx/BUILD.gn
diff --git a/third_party/libvpx_new/BUILD.gn b/third_party/libvpx/BUILD.gn
similarity index 92%
copy from third_party/libvpx_new/BUILD.gn
copy to third_party/libvpx/BUILD.gn
index e2a0320c19989c0d9ab480921d1757d298c288f2..0ea7345e6172083e9664d98eecf35578157c595d 100644
--- a/third_party/libvpx_new/BUILD.gn
+++ b/third_party/libvpx/BUILD.gn
@@ -5,7 +5,7 @@
 import("//build/config/arm.gni")
 import("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
-import("//third_party/libvpx_new/libvpx_srcs.gni")
+import("//third_party/libvpx/libvpx_srcs.gni")
 import("//third_party/yasm/yasm_assemble.gni")
 
 # Sets the architecture name for building libvpx.
@@ -30,7 +30,7 @@ if (current_cpu == "x86") {
 }
 
 if (is_nacl) {
-  platform_include_dir = "//third_party/libvpx_new/source/config/nacl"
+  platform_include_dir = "//third_party/libvpx/source/config/nacl"
 } else {
   if (is_posix && !is_mac) {
     os_category = "linux"
@@ -38,15 +38,15 @@ if (is_nacl) {
     os_category = current_os
   }
   platform_include_dir =
-      "//third_party/libvpx_new/source/config/$os_category/$cpu_arch_full"
+      "//third_party/libvpx/source/config/$os_category/$cpu_arch_full"
 }
 
 config("libvpx_config") {
   include_dirs = [
-    "//third_party/libvpx_new/source/config",
+    "//third_party/libvpx/source/config",
     platform_include_dir,
-    "//third_party/libvpx_new/source/libvpx",
-    "$root_gen_dir/third_party/libvpx_new",  # Provides vpx_rtcd.h.
+    "//third_party/libvpx/source/libvpx",
+    "$root_gen_dir/third_party/libvpx",  # Provides vpx_rtcd.h.
   ]
 
   if (current_cpu == "arm" && is_clang) {
@@ -87,7 +87,7 @@ config("libvpx_warnings") {
 
 # This config is applied to targets that depend on libvpx.
 config("libvpx_external_config") {
-  include_dirs = [ "//third_party/libvpx_new/source/libvpx" ]
+  include_dirs = [ "//third_party/libvpx/source/libvpx" ]
 }
 
 if (current_cpu == "x86" || current_cpu == "x64") {
@@ -106,8 +106,8 @@ if (current_cpu == "x86" || current_cpu == "x64") {
     }
     include_dirs = [
       platform_include_dir,
-      "//third_party/libvpx_new/source/config",
-      "//third_party/libvpx_new/source/libvpx",
+      "//third_party/libvpx/source/config",
+      "//third_party/libvpx/source/libvpx",
       target_gen_dir,
     ]
   }
@@ -220,7 +220,7 @@ if (cpu_arch_full == "arm-neon-cpu-detect") {
 # Converts ARM assembly files to GAS style.
 if (current_cpu == "arm") {
   action_foreach("convert_arm_assembly") {
-    script = "//third_party/libvpx_new/run_perl.py"
+    script = "//third_party/libvpx/run_perl.py"
     if (cpu_arch_full == "arm-neon") {
       sources = libvpx_srcs_arm_neon_assembly
     } else if (cpu_arch_full == "arm-neon-cpu-detect") {
@@ -233,9 +233,8 @@ if (current_cpu == "arm") {
     ]
     args = [
       "-s",
-      rebase_path(
-          "//third_party/libvpx_new/source/libvpx/build/make/ads2gas.pl",
-          root_build_dir),
+      rebase_path("//third_party/libvpx/source/libvpx/build/make/ads2gas.pl",
+                  root_build_dir),
       "-i",
       "{{source}}",
       "-o",
@@ -257,7 +256,7 @@ if (current_cpu == "arm") {
   }
 }
 
-static_library("libvpx_new") {
+static_library("libvpx") {
   if (!is_debug && is_win) {
     configs -= [ "//build/config/compiler:default_optimization" ]
     configs += [ "//build/config/compiler:optimize_max" ]