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

Revert "Revert 7826 "Change Android PeerConnectionUnittest to build usin...""

Browse Source 
Original cl description:

Change Android PeerConnectionUnittest to build using Chrome macros.
The purpose is to be able to run the tests using Chromes buildbots. To run:
CHECKOUT_SOURCE_ROOT=`pwd` build/android/test_runner.py instrumentation --test-apk=libjingle_peerconnection_android_unittest

This also add a new build target to build java PeerConnection using Chromes build macros.

BUG=4031
R=kjellander@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7874 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
perkj@webrtc.org
2014-12-11 12:25:57 +00:00
parent 626c09f6a3
commit 128fabaf7b
3 changed files with 42 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
talk/libjingle_examples.gyp
View File

@@ -361,7 +361,7 @@
'action_name': 'build_apprtcdemo_apk',
'inputs' : [
'<(PRODUCT_DIR)/libjingle_peerconnection.jar',
'<(PRODUCT_DIR)/libjingle_peerconnection_so.so',
'<(PRODUCT_DIR)/lib/libjingle_peerconnection_so.so',
'examples/android/AndroidManifest.xml',
'examples/android/README',
'examples/android/ant.properties',
@@ -424,7 +424,7 @@
'mkdir -p examples/android/libs/<(android_app_abi) && '
'cp <(PRODUCT_DIR)/libjingle_peerconnection.jar examples/android/libs/ &&'
'cp examples/android/third_party/autobanh/autobanh.jar examples/android/libs/ &&'
'<(android_strip) -o examples/android/libs/<(android_app_abi)/libjingle_peerconnection_so.so <(PRODUCT_DIR)/libjingle_peerconnection_so.so &&'
'<(android_strip) -o examples/android/libs/<(android_app_abi)/libjingle_peerconnection_so.so <(PRODUCT_DIR)/lib/libjingle_peerconnection_so.so &&'
'cd examples/android && '
'{ ANDROID_SDK_ROOT=<(android_sdk_root) '
'ant debug > <(ant_log) 2>&1 || '