generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert 6272 "Update generated asm offsets scripts."

Browse Source 
Revert since it fails webrtc-in-chromium Android bots.

> 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

TBR=fgalligan@google.com

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6282 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
sprang@webrtc.org
2014-05-30 09:19:03 +00:00
parent 540a2251aa
commit 6e732c6765
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@@ -96,7 +96,7 @@ deps = {
From("chromium_deps", "src/third_party/libsrtp"), From("chromium_deps", "src/third_party/libsrtp"),
"third_party/libvpx": "third_party/libvpx":
Var("chromium_trunk") + "/deps/third_party/libvpx@273304", Var("chromium_trunk") + "/deps/third_party/libvpx@269083",
"third_party/libyuv": "third_party/libyuv":
(Var("googlecode_url") % "libyuv") + "/trunk@1000", (Var("googlecode_url") % "libyuv") + "/trunk@1000",

4
webrtc/modules/audio_processing/gen_core_neon_offsets.gyp
View File

@@ -18,7 +18,7 @@
], ],
'sources': ['<(shared_generated_dir)/nsx_core_neon_offsets.o',], 'sources': ['<(shared_generated_dir)/nsx_core_neon_offsets.o',],
'variables' : { 'variables' : {
'object_file_to_extract':'nsx_core_neon_offsets.o', 'unpack_lib_name':'nsx_core_neon_offsets.o',
}, },
'includes': [ 'includes': [
'../../../third_party/libvpx/unpack_lib_posix.gypi', '../../../third_party/libvpx/unpack_lib_posix.gypi',
@@ -33,7 +33,7 @@
'<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx_obj_int_extract#host', '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx_obj_int_extract#host',
], ],
'variables': { 'variables': {
'object_file_to_extract':'aecm_core_neon_offsets.o', 'unpack_lib_name':'aecm_core_neon_offsets.o',
}, },
'sources': ['<(shared_generated_dir)/aecm_core_neon_offsets.o',], 'sources': ['<(shared_generated_dir)/aecm_core_neon_offsets.o',],
'includes': [ 'includes': [

4
webrtc/modules/audio_processing/gen_core_neon_offsets_chromium.gyp
View File

@@ -18,7 +18,7 @@
], ],
'sources': ['<(shared_generated_dir)/nsx_core_neon_offsets.o',], 'sources': ['<(shared_generated_dir)/nsx_core_neon_offsets.o',],
'variables' : { 'variables' : {
'object_file_to_extract':'nsx_core_neon_offsets.o', 'unpack_lib_name':'nsx_core_neon_offsets.o',
}, },
'includes': [ 'includes': [
'../../../../third_party/libvpx/unpack_lib_posix.gypi', '../../../../third_party/libvpx/unpack_lib_posix.gypi',
@@ -33,7 +33,7 @@
'<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx_obj_int_extract#host', '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx_obj_int_extract#host',
], ],
'variables': { 'variables': {
'object_file_to_extract':'aecm_core_neon_offsets.o', 'unpack_lib_name':'aecm_core_neon_offsets.o',
}, },
'sources': ['<(shared_generated_dir)/aecm_core_neon_offsets.o',], 'sources': ['<(shared_generated_dir)/aecm_core_neon_offsets.o',],
'includes': [ 'includes': [

22
webrtc/modules/audio_processing/lib_core_neon_offsets.gypi
View File

@@ -10,19 +10,24 @@
# and gen_core_neon_offsets_chromium.gyp # and gen_core_neon_offsets_chromium.gyp
{ {
'variables': { 'variables': {
'unpack_lib': '<(shared_generated_dir)/lib_core_neon_offsets.a', 'variables' : {
'conditions' : [ 'lib_intermediate_name': '',
['android_webview_build==1', { 'conditions' : [
'unpack_lib' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,lib_core_neon_offsets,,,$(gyp_var_prefix)))/lib_core_neon_offsets.a', ['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',
], }],
],
},
'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/audio_processing/asm_offsets', 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/audio_processing/asm_offsets',
'output_dir': '<(shared_generated_dir)', 'output_dir': '<(shared_generated_dir)',
'output_format': 'cheader', 'output_format': 'cheader',
'unpack_lib_search_path_list': [ 'unpack_lib_search_path_list': [
'-a', '<(unpack_lib)', '-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)',
], ],
'object_file_output_dir':'<(shared_generated_dir)', 'unpack_lib_output_dir':'<(shared_generated_dir)',
}, },
'includes': [ 'includes': [
'../../build/common.gypi', '../../build/common.gypi',
@@ -33,7 +38,6 @@
{ {
'target_name': 'lib_core_neon_offsets', 'target_name': 'lib_core_neon_offsets',
'type': 'static_library', 'type': 'static_library',
'product_dir': '<(shared_generated_dir)',
'android_unmangled_name': 1, 'android_unmangled_name': 1,
'hard_dependency': 1, 'hard_dependency': 1,
'sources': [ 'sources': [