commit 128fabaf7b94966aa271fa3d3f13da64a74f5b55
author perkj@webrtc.org <perkj@webrtc.org> Thu Dec 11 12:25:57 2014 +0000
committer perkj@webrtc.org <perkj@webrtc.org> Thu Dec 11 12:25:57 2014 +0000
tree 899dc85b1ed9e6f08d8e758d49d7910c6838172c
parent 626c09f6a378f38a459fc7cff73856eca2bac451

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

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

talk/libjingle_examples.gyp

diff --git a/talk/libjingle_examples.gyp b/talk/libjingle_examples.gyp
index f2c122b..75bc2f7 100755
--- a/talk/libjingle_examples.gyp
+++ b/talk/libjingle_examples.gyp
@@ -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 || '