Update generated asm offsets scripts.
Libvpx updated the unpack scripts to fix building dependencies.
Roll libvpx 269083:273304
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/
for the libvpx changes.
BUG=377062
R=andrew@webrtc.org, michaelbai@chromium.org
Review URL: https://webrtc-codereview.appspot.com/12579008
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6272 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/DEPS b/DEPS
index f1b0cad..c34fa5b 100644
--- a/DEPS
+++ b/DEPS
@@ -96,7 +96,7 @@
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@273304",
"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 55c7968..0103831 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 f4a9134..726e5e7 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 f32ddd4..f7d515d 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,7 @@
{
'target_name': 'lib_core_neon_offsets',
'type': 'static_library',
+ 'product_dir': '<(shared_generated_dir)',
'android_unmangled_name': 1,
'hard_dependency': 1,
'sources': [
