Restructuring and adding unit test targets on project level instead of in common_audio.
Review URL: http://webrtc-codereview.appspot.com/280001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@959 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@@ -28,7 +28,7 @@ LOCAL_CFLAGS := \
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(LOCAL_PATH)/../interface \
|
||||
$(LOCAL_PATH)/../../../../../.. \
|
||||
$(LOCAL_PATH)/../../../../../../common_audio/signal_processing_library/main/interface
|
||||
$(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := \
|
||||
libdl \
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
'target_name': 'CNG',
|
||||
'type': '<(library)',
|
||||
'dependencies': [
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:spl',
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
|
||||
],
|
||||
'include_dirs': [
|
||||
'../interface',
|
||||
|
||||
@@ -49,7 +49,7 @@ LOCAL_CFLAGS := \
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(LOCAL_PATH)/../interface \
|
||||
$(LOCAL_PATH)/../../../../../.. \
|
||||
$(LOCAL_PATH)/../../../../../../common_audio/signal_processing_library/main/interface
|
||||
$(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := \
|
||||
libcutils \
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
'target_name': 'iSACFix',
|
||||
'type': '<(library)',
|
||||
'dependencies': [
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:spl',
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
|
||||
],
|
||||
'include_dirs': [
|
||||
'../interface',
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
'include_dirs': [
|
||||
'./main/test',
|
||||
'./main/interface',
|
||||
'../../../../common_audio/signal_processing_library/main/interface',
|
||||
'../../../../common_audio/signal_processing/include',
|
||||
'./main/util',
|
||||
],
|
||||
'sources': [
|
||||
|
||||
@@ -53,7 +53,7 @@ LOCAL_CFLAGS := \
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(LOCAL_PATH)/../interface \
|
||||
$(LOCAL_PATH)/../../../../../.. \
|
||||
$(LOCAL_PATH)/../../../../../../common_audio/signal_processing_library/main/interface
|
||||
$(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := \
|
||||
libcutils \
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
'target_name': 'iSAC',
|
||||
'type': '<(library)',
|
||||
'dependencies': [
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:spl',
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
|
||||
],
|
||||
'include_dirs': [
|
||||
'../interface',
|
||||
|
||||
@@ -93,7 +93,7 @@ LOCAL_CFLAGS := \
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(LOCAL_PATH)/interface \
|
||||
$(LOCAL_PATH)/../../../.. \
|
||||
$(LOCAL_PATH)/../../../../common_audio/signal_processing_library/main/interface
|
||||
$(LOCAL_PATH)/../../../../common_audio/signal_processing/include
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := \
|
||||
libcutils \
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
'target_name': 'iLBC',
|
||||
'type': '<(library)',
|
||||
'dependencies': [
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:spl',
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
|
||||
],
|
||||
'include_dirs': [
|
||||
'interface',
|
||||
|
||||
@@ -51,9 +51,9 @@ LOCAL_C_INCLUDES := \
|
||||
$(LOCAL_PATH)/../../neteq/interface \
|
||||
$(LOCAL_PATH)/../../../.. \
|
||||
$(LOCAL_PATH)/../../../interface \
|
||||
$(LOCAL_PATH)/../../../../common_audio/resampler/main/interface \
|
||||
$(LOCAL_PATH)/../../../../common_audio/signal_processing_library/main/interface \
|
||||
$(LOCAL_PATH)/../../../../common_audio/vad/main/interface \
|
||||
$(LOCAL_PATH)/../../../../common_audio/resampler/include \
|
||||
$(LOCAL_PATH)/../../../../common_audio/signal_processing/include \
|
||||
$(LOCAL_PATH)/../../../../common_audio/vad/include \
|
||||
$(LOCAL_PATH)/../../../../system_wrappers/interface
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := \
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
'PCM16B',
|
||||
'NetEq',
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:resampler',
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:spl',
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:vad',
|
||||
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
|
||||
],
|
||||
|
||||
@@ -60,7 +60,7 @@ LOCAL_C_INCLUDES := \
|
||||
$(LOCAL_PATH)/interface \
|
||||
$(LOCAL_PATH)/../codecs/CNG/main/interface \
|
||||
$(LOCAL_PATH)/../../.. \
|
||||
$(LOCAL_PATH)/../../../common_audio/signal_processing_library/main/interface
|
||||
$(LOCAL_PATH)/../../../common_audio/signal_processing/include
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := \
|
||||
libcutils \
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
'type': '<(library)',
|
||||
'dependencies': [
|
||||
'CNG',
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:spl',
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
|
||||
],
|
||||
'defines': [
|
||||
'NETEQ_VOICEENGINE_CODECS', # TODO: Should create a Chrome define which
|
||||
|
||||
Reference in New Issue
Block a user