Move libvpx_new to libvpx

third_party/libvpx/libvpx.gyp

Index: third_party/libvpx/libvpx.gyp
diff --git a/third_party/libvpx_new/libvpx.gyp b/third_party/libvpx/libvpx.gyp
similarity index 97%
copy from third_party/libvpx_new/libvpx.gyp
copy to third_party/libvpx/libvpx.gyp
index 0ecfdf6b3287771016566f999b36e654440382c6..58232ea1dd177f09ffe416d6d8482e5503d117b0 100644
--- a/third_party/libvpx_new/libvpx.gyp
+++ b/third_party/libvpx/libvpx.gyp
@@ -45,7 +45,7 @@
     ],
 
     # Location of the intermediate output.
-    'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx_new',
+    'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx',
   },
   'target_defaults': {
     'conditions': [
@@ -103,10 +103,10 @@
         {
           # This libvpx target contains both encoder and decoder.
           # Encoder is configured to be realtime only.
-          'target_name': 'libvpx_new',
+          'target_name': 'libvpx',
           'type': 'static_library',
           'variables': {
-            'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx_new',
+            'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx',
             'OS_CATEGORY%': '<(OS_CATEGORY)',
             'yasm_flags': [
               '-D', 'CHROMIUM',
@@ -198,11 +198,11 @@
         {
           # This libvpx target contains both encoder and decoder.
           # Encoder is configured to be realtime only.
-          'target_name': 'libvpx_new',
+          'target_name': 'libvpx',
           'type': 'static_library',
           'variables': {
             'shared_generated_dir':
-              '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx_new',
+              '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx',
           },
           'includes': [
             'libvpx_srcs_mips.gypi',
@@ -233,7 +233,7 @@
         {
           # This libvpx target contains both encoder and decoder.
           # Encoder is configured to be realtime only.
-          'target_name': 'libvpx_new',
+          'target_name': 'libvpx',
           'type': 'static_library',
 
           'includes': [ 'ads2gas.gypi', ],