From 27f062ae6fec5b7ae5bb0250cb1de73bdd06983e Mon Sep 17 00:00:00 2001
From: "fgalligan@google.com"
 <fgalligan@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Thu, 12 Jun 2014 14:59:28 +0000
Subject: [PATCH] Update generated asm offsets scripts.

This is the same CL as https://webrtc-codereview.appspot.com/16629004/
Relanding and TBR from previous lgtm.

Libvpx updated the unpack scripts to fix building dependencies.

Roll libvpx 269083:275816
See https://codereview.chromium.org/295313002/
https://codereview.chromium.org/298063002/
https://codereview.chromium.org/305533008/
https://codereview.chromium.org/305703002/
https://codereview.chromium.org/298383003/
https://codereview.chromium.org/302863004/
https://codereview.chromium.org/320923003/
for the libvpx changes.

See https://codereview.chromium.org/313243004/
for the WebView changes.

*NOTE* This CL will break the Android bots as they are built in a
Chromium checkout, which will pull in old libvpx DEPS. They will
cycle to green when we roll libvpx into Chromium. We must do the
rolls in this order becuase we have to land webrtc and libvpx at
the same time into Chromium.

BUG=377062
TBR=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/17689004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6415 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 DEPS                                          |  2 +-
 .../gen_core_neon_offsets.gyp                 |  4 +--
 .../gen_core_neon_offsets_chromium.gyp        |  4 +--
 .../lib_core_neon_offsets.gypi                | 26 +++++++++----------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/DEPS b/DEPS
index 43c4bdfe32..fa7bf5a441 100644
--- a/DEPS
+++ b/DEPS
@@ -96,7 +96,7 @@ deps = {
     From("chromium_deps", "src/third_party/libsrtp"),
 
   "third_party/libvpx":
-    Var("chromium_trunk") + "/deps/third_party/libvpx@269083",
+    Var("chromium_trunk") + "/deps/third_party/libvpx@275816",
 
   "third_party/libyuv":
     (Var("googlecode_url") % "libyuv") + "/trunk@1000",
diff --git a/webrtc/modules/audio_processing/gen_core_neon_offsets.gyp b/webrtc/modules/audio_processing/gen_core_neon_offsets.gyp
index 55c79689f7..0103831a48 100644
--- a/webrtc/modules/audio_processing/gen_core_neon_offsets.gyp
+++ b/webrtc/modules/audio_processing/gen_core_neon_offsets.gyp
@@ -18,7 +18,7 @@
       ],
       'sources': ['<(shared_generated_dir)/nsx_core_neon_offsets.o',],
       'variables' : {
-        'unpack_lib_name':'nsx_core_neon_offsets.o',
+        'object_file_to_extract':'nsx_core_neon_offsets.o',
       },
       'includes': [
         '../../../third_party/libvpx/unpack_lib_posix.gypi',
@@ -33,7 +33,7 @@
         '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx_obj_int_extract#host',
       ],
       'variables': {
-        'unpack_lib_name':'aecm_core_neon_offsets.o',
+        'object_file_to_extract':'aecm_core_neon_offsets.o',
       },
       'sources': ['<(shared_generated_dir)/aecm_core_neon_offsets.o',],
       'includes': [
diff --git a/webrtc/modules/audio_processing/gen_core_neon_offsets_chromium.gyp b/webrtc/modules/audio_processing/gen_core_neon_offsets_chromium.gyp
index f4a9134fb2..726e5e79b9 100644
--- a/webrtc/modules/audio_processing/gen_core_neon_offsets_chromium.gyp
+++ b/webrtc/modules/audio_processing/gen_core_neon_offsets_chromium.gyp
@@ -18,7 +18,7 @@
       ],
       'sources': ['<(shared_generated_dir)/nsx_core_neon_offsets.o',],
       'variables' : {
-        'unpack_lib_name':'nsx_core_neon_offsets.o',
+        'object_file_to_extract':'nsx_core_neon_offsets.o',
       },
       'includes': [
         '../../../../third_party/libvpx/unpack_lib_posix.gypi',
@@ -33,7 +33,7 @@
         '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx_obj_int_extract#host',
       ],
       'variables': {
-        'unpack_lib_name':'aecm_core_neon_offsets.o',
+        'object_file_to_extract':'aecm_core_neon_offsets.o',
       },
       'sources': ['<(shared_generated_dir)/aecm_core_neon_offsets.o',],
       'includes': [
diff --git a/webrtc/modules/audio_processing/lib_core_neon_offsets.gypi b/webrtc/modules/audio_processing/lib_core_neon_offsets.gypi
index f32ddd47f7..b3151be8f6 100644
--- a/webrtc/modules/audio_processing/lib_core_neon_offsets.gypi
+++ b/webrtc/modules/audio_processing/lib_core_neon_offsets.gypi
@@ -10,24 +10,19 @@
 # and gen_core_neon_offsets_chromium.gyp
 {
   'variables': {
-    'variables' : {
-      'lib_intermediate_name': '',
-      'conditions' : [
-        ['android_webview_build==1', {
-          'lib_intermediate_name' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,lib_core_neon_offsets,,,$(gyp_var_prefix)))/lib_core_neon_offsets.a',
-        }],
-      ],
-    },
+    'unpack_lib': '<(shared_generated_dir)/lib_core_neon_offsets.a',
+    'conditions' : [
+      ['android_webview_build==1', {
+        'unpack_lib' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,lib_core_neon_offsets,,,$(gyp_var_prefix)))/lib_core_neon_offsets.a',
+      }],
+    ],
     'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/audio_processing/asm_offsets',
     'output_dir': '<(shared_generated_dir)',
     'output_format': 'cheader',
     'unpack_lib_search_path_list': [
-      '-a', '<(PRODUCT_DIR)/lib_core_neon_offsets.a',
-      '-a', '<(LIB_DIR)/webrtc/modules/audio_processing/lib_core_neon_offsets.a',
-      '-a', '<(LIB_DIR)/third_party/webrtc/modules/audio_processing/lib_core_neon_offsets.a',
-      '-a', '<(lib_intermediate_name)',
+      '-a', '<(unpack_lib)',
     ],
-    'unpack_lib_output_dir':'<(shared_generated_dir)',
+    'object_file_output_dir':'<(shared_generated_dir)',
   },
   'includes': [
     '../../build/common.gypi',
@@ -38,6 +33,11 @@
         {
           'target_name': 'lib_core_neon_offsets',
           'type': 'static_library',
+          'conditions': [
+            ['android_webview_build==0', {
+              'product_dir': '<(shared_generated_dir)',
+            }],
+          ],
           'android_unmangled_name': 1,
           'hard_dependency': 1,
           'sources': [