Revert 6481 and 6482
Revert 6482 "Update webrtc to fix unpack_lib expansion."
Revert 6481 "Update generated asm offsets scripts."
The roll has not been successful. Reverted based on the request of the
committer.
TBR=turaj
Review URL: https://webrtc-codereview.appspot.com/17759004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6495 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/modules/audio_processing/gen_core_neon_offsets.gyp b/modules/audio_processing/gen_core_neon_offsets.gyp
index 0103831..55c7968 100644
--- a/modules/audio_processing/gen_core_neon_offsets.gyp
+++ b/modules/audio_processing/gen_core_neon_offsets.gyp
@@ -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': [
diff --git a/modules/audio_processing/gen_core_neon_offsets_chromium.gyp b/modules/audio_processing/gen_core_neon_offsets_chromium.gyp
index 726e5e7..f4a9134 100644
--- a/modules/audio_processing/gen_core_neon_offsets_chromium.gyp
+++ b/modules/audio_processing/gen_core_neon_offsets_chromium.gyp
@@ -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': [
diff --git a/modules/audio_processing/lib_core_neon_offsets.gypi b/modules/audio_processing/lib_core_neon_offsets.gypi
index 64a7a21..f32ddd4 100644
--- a/modules/audio_processing/lib_core_neon_offsets.gypi
+++ b/modules/audio_processing/lib_core_neon_offsets.gypi
@@ -10,19 +10,24 @@
# and gen_core_neon_offsets_chromium.gyp
{
'variables': {
- '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_list' : ['-a', '$(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',
- 'unpack_lib_search_path_list' : ['-a', '<(shared_generated_dir)/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',
- 'object_file_output_dir':'<(shared_generated_dir)',
+ '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)',
+ ],
+ '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': [
