commit 3b3c4069082e00d0430e75ac242c6f0578e7a528
author andrew@webrtc.org <andrew@webrtc.org> Mon Dec 08 17:21:50 2014 +0000
committer andrew@webrtc.org <andrew@webrtc.org> Mon Dec 08 17:21:50 2014 +0000
tree 0bd8cfeed1204f737b59e7283bb0fafa1c144b08
parent cb858ba3974c921627e81805e2ab4a2ae52c6619

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

Broke gclient runhooks on internal bots. e.g.
http://chromegw/i/internal.client.webrtc/builders/Linux64%20Debug/builds/3575

> 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/28189004

TBR=perkj@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7829 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/libjingle_examples.gyp

diff --git a/talk/libjingle_examples.gyp b/talk/libjingle_examples.gyp
index 34194a8..f17fbfe 100755
--- a/talk/libjingle_examples.gyp
+++ b/talk/libjingle_examples.gyp
@@ -321,7 +321,7 @@
               'action_name': 'build_apprtcdemo_apk',
               'inputs' : [
                 '<(PRODUCT_DIR)/libjingle_peerconnection.jar',
-                '<(PRODUCT_DIR)/lib/libjingle_peerconnection_so.so',
+                '<(PRODUCT_DIR)/libjingle_peerconnection_so.so',
                 'examples/android/AndroidManifest.xml',
                 'examples/android/README',
                 'examples/android/ant.properties',
@@ -384,7 +384,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)/lib/libjingle_peerconnection_so.so &&'
+                '<(android_strip) -o examples/android/libs/<(android_app_abi)/libjingle_peerconnection_so.so  <(PRODUCT_DIR)/libjingle_peerconnection_so.so &&'
                 'cd examples/android && '
                 '{ ANDROID_SDK_ROOT=<(android_sdk_root) '
                 'ant debug > <(ant_log) 2>&1 || '