diff options
| author | minyue@webrtc.org <minyue@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-12 08:48:34 +0000 |
|---|---|---|
| committer | minyue@webrtc.org <minyue@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-12 08:48:34 +0000 |
| commit | 4150d6e4f5996029702baacd3690d50a8050386a (patch) | |
| tree | 44af40089da52c55db6a6f294248f0c24e39416e /modules | |
| parent | f6eaabf14c12d2fd16152332aadc8a01a98c1a25 (diff) | |
| download | webrtc-4150d6e4f5996029702baacd3690d50a8050386a.tar.gz | |
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
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6411 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/audio_processing/gen_core_neon_offsets.gyp | 4 | ||||
| -rw-r--r-- | modules/audio_processing/gen_core_neon_offsets_chromium.gyp | 4 | ||||
| -rw-r--r-- | modules/audio_processing/lib_core_neon_offsets.gypi | 26 |
3 files changed, 17 insertions, 17 deletions
diff --git a/modules/audio_processing/gen_core_neon_offsets.gyp b/modules/audio_processing/gen_core_neon_offsets.gyp index 55c79689..0103831a 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' : { - '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/modules/audio_processing/gen_core_neon_offsets_chromium.gyp b/modules/audio_processing/gen_core_neon_offsets_chromium.gyp index f4a9134f..726e5e79 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' : { - '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/modules/audio_processing/lib_core_neon_offsets.gypi b/modules/audio_processing/lib_core_neon_offsets.gypi index f32ddd47..b3151be8 100644 --- a/modules/audio_processing/lib_core_neon_offsets.gypi +++ b/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,11 @@ { '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': [ |