diff options
| author | yongsheng.zhu@intel.com <yongsheng.zhu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 09:27:12 +0000 |
|---|---|---|
| committer | yongsheng.zhu@intel.com <yongsheng.zhu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 09:27:12 +0000 |
| commit | bacb1fba0b9b9210c66e567c4b92fbe7e47a9235 (patch) | |
| tree | 6cc6f8571162084afa4255910072d6ec73038dc0 /testing | |
| parent | ad9b096876c61d72d74abc16af614ad5560852c6 (diff) | |
| download | chromium_src-bacb1fba0b9b9210c66e567c4b92fbe7e47a9235.zip chromium_src-bacb1fba0b9b9210c66e567c4b92fbe7e47a9235.tar.gz chromium_src-bacb1fba0b9b9210c66e567c4b92fbe7e47a9235.tar.bz2 | |
Add the target ABI option for apk based test runner
Remove the hardcode directory name 'armeabi' and replace it with the Android target ABI information.
Trivial gyp changes that are android-specific; TBRing some owners
TBR=mark@chromium.org,jam@chromium.org,sky@chromium.org
BUG=128944
TEST=
Review URL: https://chromiumcodereview.appspot.com/10383263
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
| -rwxr-xr-x | testing/android/generate_native_test.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/testing/android/generate_native_test.py b/testing/android/generate_native_test.py index bd7c136..5fe664a 100755 --- a/testing/android/generate_native_test.py +++ b/testing/android/generate_native_test.py @@ -51,10 +51,11 @@ class NativeTestApkGenerator(object): 'native_test_apk.xml', 'res/values/strings.xml'] - def __init__(self, native_library, jars, output_directory): + def __init__(self, native_library, jars, output_directory, target_abi): self._native_library = native_library self._jars = jars self._output_directory = output_directory + self._target_abi = target_abi self._root_name = None if self._native_library: self._root_name = self._LibraryRoot() @@ -119,7 +120,7 @@ class NativeTestApkGenerator(object): def _CopyLibraryAndJars(self): """Copy the shlib and jars into the apk source tree (if relevant)""" if self._native_library: - destdir = os.path.join(self._output_directory, 'libs/armeabi') + destdir = os.path.join(self._output_directory, 'libs/' + self._target_abi) if not os.path.exists(destdir): os.makedirs(destdir) dest = os.path.join(destdir, os.path.basename(self._native_library)) @@ -172,6 +173,8 @@ def main(argv): help='Space separated list of jars to be included') parser.add_option('--output', help='Output directory for generated files.') + parser.add_option('--app_abi', default='armeabi', + help='ABI for native shared library') parser.add_option('--ant-compile', action='store_true', help='If specified, build the generated apk with ant') parser.add_option('--ant-args', @@ -194,7 +197,8 @@ def main(argv): jar_list = options.jars.replace('"', '').split() ntag = NativeTestApkGenerator(native_library=options.native_library, jars=jar_list, - output_directory=options.output) + output_directory=options.output, + target_abi=options.app_abi) ntag.CreateBundle() if options.ant_compile: ntag.Compile(options.ant_args) |