Move libvpx_new to libvpx

third_party/libvpx/libvpx.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'libvpx_build_vp9%': 1,
     'libvpx_source%': 'source/libvpx',
     # Disable LTO for neon targets
     # crbug.com/408997
     'use_lto%': 0,
@@ skipping 27 matching lines @@
       }],
 
       ['os_posix == 1 and OS != "mac"', {
         'OS_CATEGORY%': 'linux',
       }, {
         'OS_CATEGORY%': '<(OS)',
       }],
     ],
 
     # 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': [
       ['target_arch=="arm" and clang==1', {
         # TODO(hans) Enable integrated-as (crbug.com/124610).
         'cflags': [ '-fno-integrated-as' ],
         'conditions': [
           ['OS == "android"', {
             # Else /usr/bin/as gets picked up.
             'cflags': [ '-B<(android_toolchain)' ],
@@ skipping 37 matching lines @@
       # When building for targets which may not have NEON (but may!), include
       # support for neon and hide it behind Android cpu-features.
       'includes': ['libvpx_srcs_arm_neon_cpu_detect_intrinsics.gypi', ],
     }],
     [ '(target_arch != "arm" and target_arch != "armv7") and \
        (target_arch != "mipsel" and target_arch != "mips64el")', {
       'targets': [
         {
           # 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',
               '-I', 'source/config/<(OS_CATEGORY)/<(target_arch_full)',
               '-I', 'source/config',
               '-I', '<(libvpx_source)',
             ],
             # yasm only gets the flags we define. It doesn't inherit any of the
             # really useful defines that come with a gcc invocation. In this
             # case, we rely on __ANDROID__ to set 'rand' to 'lrand48'.
@@ skipping 71 matching lines @@
         },
       ],
     },
     ],
     # 'libvpx' target for mipsel and mips64el builds.
     [ 'target_arch=="mipsel" or target_arch=="mips64el"', {
       'targets': [
         {
           # 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',
           ],
           'include_dirs': [
             'source/config/<(OS_CATEGORY)/<(target_arch_full)',
             'source/config',
             '<(libvpx_source)',
             '<(libvpx_source)/vp8/common',
             '<(libvpx_source)/vp8/decoder',
@@ skipping 10 matching lines @@
         },
       ],
     },
     ],
     # 'libvpx' target for ARM builds.
     [ '(target_arch=="arm" or target_arch=="armv7") ', {
       'targets': [
         {
           # 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', ],
 
           'xcode_settings': {
             'OTHER_CFLAGS': [
               '-I<!(pwd)/source/config/<(OS_CATEGORY)/<(target_arch_full)',
               '-I<!(pwd)/source/config',
               '-I<(shared_generated_dir)',
             ],
@@ skipping 44 matching lines @@
                   '-fstack-protector-all',  # Implies -fstack-protector
                 ],
               },
             }],
           ],
         },
       ],
     }],
   ],
 }