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

Revert 6473 "Update generated asm offsets scripts."

Browse Source 
The roll has not been successful. Reverted based on the request of the committer.

> Update generated asm offsets scripts.
> 
> Libvpx updated the unpack scripts to fix building dependencies.
> 
> Roll libvpx 269083:277778
> 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/
> https://codereview.chromium.org/325313007/
> 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 because 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/15809004

TBR=fgalligan@google.com

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6475 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
turaj@webrtc.org 2014-06-17 19:07:56 +00:00
parent e398954658
commit ec869bf781
4 changed files with 18 additions and 20 deletions
Show Stats 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@277778",
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': [

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

@ -10,21 +10,24 @@
# and gen_core_neon_offsets_chromium.gyp
{
'variables': {
'unpack_lib': '<(shared_generated_dir)/lib_core_neon_offsets.a',
'unpack_lib_search_path' : '<(unpack_lib)',
'conditions' : [
['android_webview_build==1', {
'unpack_lib' : '$(call intermediates-dir-for,STATIC_LIBRARIES,lib_core_neon_offsets,,,$(gyp_var_prefix))/lib_core_neon_offsets.a',
'unpack_lib_search_path' : '$(abspath <(unpack_lib))',
}],
],
'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_search_path)',
'-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',
@ -35,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': [