summaryrefslogtreecommitdiffstats
path: root/tools/android
diff options
context:
space:
mode:
authorcjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-03 21:04:39 +0000
committercjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-03 21:04:39 +0000
commitc64907f935210e8040db30f76afdd6b3950c54b8 (patch)
treee59498657953dbebbcd14e22c346f68c5e948df8 /tools/android
parent9f6614b5d3c84913cba283d795a6d7135e6455d6 (diff)
downloadchromium_src-c64907f935210e8040db30f76afdd6b3950c54b8.zip
chromium_src-c64907f935210e8040db30f76afdd6b3950c54b8.tar.gz
chromium_src-c64907f935210e8040db30f76afdd6b3950c54b8.tar.bz2
[Android] Fix md5sum for component build
In the component build, the device executable requires shared libraries to run. When building, use build/android/native_app_dependencies.gypi to copy the executable+libraries to a dist directory. Then, in android_commands.py we need to copy that directory to the device and specify LD_LIBRARY_PATH when running the executable. NOTRY=true BUG=158821 Review URL: https://chromiumcodereview.appspot.com/14646030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/android')
-rw-r--r--tools/android/md5sum/md5sum.gyp7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/android/md5sum/md5sum.gyp b/tools/android/md5sum/md5sum.gyp
index f5baa65..0056845 100644
--- a/tools/android/md5sum/md5sum.gyp
+++ b/tools/android/md5sum/md5sum.gyp
@@ -11,6 +11,13 @@
'md5sum_stripped_device_bin',
'md5sum_bin_host#host',
],
+ # For the component build, ensure dependent shared libraries are stripped
+ # and put alongside md5sum to simplify pushing to the device.
+ 'variables': {
+ 'output_dir': '<(PRODUCT_DIR)/md5sum_dist/',
+ 'native_binary': '<(PRODUCT_DIR)/md5sum_bin',
+ },
+ 'includes': ['../../../build/android/native_app_dependencies.gypi'],
},
{
'target_name': 'md5sum_device_bin',