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

Fix a circular dependency by removing an unnecessary dependency, add a missing include_tests check and missing lib references for android.

Browse Source 
TBR=henrikg@webrtc.org, pbos@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4312 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
stefan@webrtc.org 2013-07-09 13:43:24 +00:00
parent f56d612c70
commit cab716cc7d
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_components.gyp
View File

@ -18,8 +18,6 @@
'<(webrtc_root)/modules/remote_bitrate_estimator',
],
'sources': [
'bitrate_estimator.cc',
'bitrate_estimator.h',
'overuse_detector.cc',
'overuse_detector.h',
'remote_bitrate_estimator_single_stream.cc',
@ -27,19 +25,25 @@
'remote_rate_control.h',
],
},
{
'target_name': 'rbe_components_unittests',
'type': 'static_library',
'dependencies': [
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/modules/modules.gyp:remote_bitrate_estimator',
],
'sources': [
'<(rbe_components_path)/remote_bitrate_estimator_single_stream_unittest.cc',
'<(rbe_components_path)/remote_bitrate_estimator_unittest_helper.cc',
'<(rbe_components_path)/remote_bitrate_estimator_unittest_helper.h',
],
'conditions': [
['include_tests==1', {
'targets': [
{
'target_name': 'rbe_components_unittests',
'type': 'static_library',
'dependencies': [
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'<(rbe_components_path)/remote_bitrate_estimator_single_stream_unittest.cc',
'<(rbe_components_path)/remote_bitrate_estimator_unittest_helper.cc',
'<(rbe_components_path)/remote_bitrate_estimator_unittest_helper.h',
],
},
],
},
],
],
}

7
webrtc/video_engine/test/android/jni/Android.mk
View File

@ -170,6 +170,12 @@ LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/libremote_bitrate_estimator.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := librbe_components
LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/librbe_components.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := librtp_rtcp
LOCAL_SRC_FILES := \
@ -384,6 +390,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libcpu_features_android \
libaudio_device \
libremote_bitrate_estimator \
librbe_components \
librtp_rtcp \
libmedia_file \
libchannel_transport \