summaryrefslogtreecommitdiffstats
path: root/tools/android
diff options
context:
space:
mode:
authoryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-18 07:23:26 +0000
committeryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-18 07:23:26 +0000
commit7beabebff197b32fcb8c8ddcbc638ac80c908df7 (patch)
tree3879e9d625e1671e17df92bc9e6e17d8325a61fa /tools/android
parent82cafd94d689e4779840c78c842ba36f63c55efc (diff)
downloadchromium_src-7beabebff197b32fcb8c8ddcbc638ac80c908df7.zip
chromium_src-7beabebff197b32fcb8c8ddcbc638ac80c908df7.tar.gz
chromium_src-7beabebff197b32fcb8c8ddcbc638ac80c908df7.tar.bz2
[Android] Fix forwarder for the component build
Repurposes the gyp scripts for processing native libraries for an apk and use them for a native library (i.e. forwarder). Additionally, adjusts the forwarder python script to set LD_LIBRARY_PATH when invoking the forwarder. BUG=158821 Review URL: https://chromiumcodereview.appspot.com/14322004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/android')
-rw-r--r--tools/android/forwarder2/forwarder.gyp7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/android/forwarder2/forwarder.gyp b/tools/android/forwarder2/forwarder.gyp
index db21208..ddf36be 100644
--- a/tools/android/forwarder2/forwarder.gyp
+++ b/tools/android/forwarder2/forwarder.gyp
@@ -11,6 +11,13 @@
'device_forwarder',
'host_forwarder#host',
],
+ # For the component build, ensure dependent shared libraries are stripped
+ # and put alongside forwarder to simplify pushing to the device.
+ 'variables': {
+ 'output_dir': '<(PRODUCT_DIR)/forwarder_dist/',
+ 'native_binary': '<(PRODUCT_DIR)/device_forwarder',
+ },
+ 'includes': ['../../../build/android/native_app_dependencies.gypi'],
},
{
'target_name': 'device_forwarder',