zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Use libvpx's obj_int_extract and unpack_lib_posix to generate offset header file."

Browse Source 
This reverts commit 7686f0ddda717a9e776be0e219f039f68a10f9ed.

BUG=

TBR=andrew@webrtc.org, fischman@webrtc.org,

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5520 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
michaelbai@google.com
2014-02-10 19:26:26 +00:00
parent 1f64f06784
commit a65abf9d3a
7 changed files with 171 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,6 @@
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/audio_processing/asm_offsets',
},
'targets': [
{
@ -195,15 +194,12 @@
'conditions': [
['OS=="android" or OS=="ios"', {
'dependencies': [
'<(gen_core_neon_offsets_gyp):*',
'audio_processing_offsets',
],
'sources': [
'aecm/aecm_core_neon.S',
'ns/nsx_core_neon.S',
],
'include_dirs': [
'<(shared_generated_dir)',
],
'sources!': [
'aecm/aecm_core_neon.c',
'ns/nsx_core_neon.c',
@ -212,6 +208,22 @@
}],
],
}],
'conditions': [
['OS=="android" or OS=="ios"', {
'targets': [{
'target_name': 'audio_processing_offsets',
'type': 'none',
'sources': [
'aecm/aecm_core_neon_offsets.c',
'ns/nsx_core_neon_offsets.c',
],
'variables': {
'asm_header_dir': 'asm_offsets',
},
'includes': ['../../build/generate_asm_header.gypi',],
}],
}],
],
}],
],
}

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

@ -1,45 +0,0 @@
# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{
'includes': ['lib_core_neon_offsets.gypi'],
'targets' : [
{
'target_name': 'gen_nsx_core_neon_offsets_h',
'type': 'none',
'dependencies': [
'lib_core_neon_offsets',
'<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx_obj_int_extract#host',
],
'sources': ['<(shared_generated_dir)/nsx_core_neon_offsets.o',],
'variables' : {
'unpack_lib_name':'nsx_core_neon_offsets.o',
},
'includes': [
'../../../third_party/libvpx/unpack_lib_posix.gypi',
'../../../third_party/libvpx/obj_int_extract.gypi',
],
},
{
'target_name': 'gen_aecm_core_neon_offsets_h',
'type': 'none',
'dependencies': [
'lib_core_neon_offsets',
'<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx_obj_int_extract#host',
],
'variables': {
'unpack_lib_name':'aecm_core_neon_offsets.o',
},
'sources': ['<(shared_generated_dir)/aecm_core_neon_offsets.o',],
'includes': [
'../../../third_party/libvpx/unpack_lib_posix.gypi',
'../../../third_party/libvpx/obj_int_extract.gypi',
],
},
],
}

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

@ -1,45 +0,0 @@
# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{
'includes': ['lib_core_neon_offsets.gypi'],
'targets' : [
{
'target_name': 'gen_nsx_core_neon_offsets_h',
'type': 'none',
'dependencies': [
'lib_core_neon_offsets',
'<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx_obj_int_extract#host',
],
'sources': ['<(INTERMEDIATE_DIR)/nsx_core_neon_offsets.o',],
'variables' : {
'unpack_lib_name':'nsx_core_neon_offsets.o',
},
'includes': [
'../../../../third_party/libvpx/unpack_lib_posix.gypi',
'../../../../third_party/libvpx/obj_int_extract.gypi',
],
},
{
'target_name': 'gen_aecm_core_neon_offsets_h',
'type': 'none',
'dependencies': [
'lib_core_neon_offsets',
'<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx_obj_int_extract#host',
],
'variables': {
'unpack_lib_name':'aecm_core_neon_offsets.o',
},
'sources': ['<(INTERMEDIATE_DIR)/aecm_core_neon_offsets.o',],
'includes': [
'../../../../third_party/libvpx/unpack_lib_posix.gypi',
'../../../../third_party/libvpx/obj_int_extract.gypi',
],
},
],
}

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

@ -1,51 +0,0 @@
# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
# This file has common information for gen_core_neon_offsets.gyp
# and gen_core_neon_offsets_chromium.gyp
{
'variables': {
'variables' : {
'lib_intermediate_name': '',
'conditions' : [
['android_webview_build==1', {
'lib_intermediate_name' : '<(android_src)/$(call intermediates-dir-for, STATIC_LIBRARIES, lib_core_neon_offsets)/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)',
],
'unpack_lib_output_dir':'<(shared_generated_dir)',
},
'includes': [
'../../build/common.gypi',
],
'conditions': [
['((target_arch=="arm" and arm_version==7) or target_arch=="armv7") and (OS=="android" or OS=="ios")', {
'targets' : [
{
'target_name': 'lib_core_neon_offsets',
'type': 'static_library',
'android_unmangled_name': 1,
'hard_dependency': 1,
'sources': [
'ns/nsx_core_neon_offsets.c',
'aecm/aecm_core_neon_offsets.c',
],
},
],
}],
],
}