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

Revert 6411 "Revert 6407 "Revert 6405 "Update generated asm offs..."

Browse Source 
Turns out the previous revert was based on invalid assumptions.
The libvpx in Chromium was reverted in 
http://chromegw.corp.google.com/viewvc/chrome?view=rev&revision=271259
which ends up with libvpx r269083. Therefore we should restore
that same libvpx revision for WebRTC, which this revert will do.

> Revert 6407 "Revert 6405 "Update generated asm offsets scripts.""
> 
> > Revert 6405 "Update generated asm offsets scripts."
> > 
> > TBR=fgalligan@google.com
> > BUG=N/A
> > 
> > Review URL: https://webrtc-codereview.appspot.com/20639004
> 
> TBR=henrike@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/15739004

TBR=minyue@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6413 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org
2014-06-12 11:07:07 +00:00
parent b90619c07f
commit 7e3d62d709
4 changed files with 18 additions and 18 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"),
"third_party/libvpx":
Var("chromium_trunk") + "/deps/third_party/libvpx@275816",
Var("chromium_trunk") + "/deps/third_party/libvpx@269083",
"third_party/libyuv":
(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',],
'variables' : {
'object_file_to_extract':'nsx_core_neon_offsets.o',
'unpack_lib_name':'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': {
'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',],
'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',],
'variables' : {
'object_file_to_extract':'nsx_core_neon_offsets.o',
'unpack_lib_name':'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': {
'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',],
'includes': [

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

@@ -10,19 +10,24 @@
# and gen_core_neon_offsets_chromium.gyp
{
'variables': {
'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',
}],
],
'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',
}],
],
},
'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/audio_processing/asm_offsets',
'output_dir': '<(shared_generated_dir)',
'output_format': 'cheader',
'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': [
'../../build/common.gypi',
@@ -33,11 +38,6 @@
{
'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': [