summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-09 09:11:57 +0000
committerbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-09 09:11:57 +0000
commit3f31956ff9df0f78a83f6ac5a1e3e66386622591 (patch)
tree7c4f31eb5b7646cbfb0f481359e71548800090ee /testing
parent6f26551ca36d415a50118a6b45c44458c98f5094 (diff)
downloadchromium_src-3f31956ff9df0f78a83f6ac5a1e3e66386622591.zip
chromium_src-3f31956ff9df0f78a83f6ac5a1e3e66386622591.tar.gz
chromium_src-3f31956ff9df0f78a83f6ac5a1e3e66386622591.tar.bz2
[android] Split top-level scripts and libraries from build/android.
- Top-level scripts are kept under build/android. - Utility libraries have been moved to build/android/pylib. - Fixes all imports and headers. This is in preparation for landing the "instrumentation" (java-based) tests, which will reuse several of these components. BUG= TEST=existing android tests Review URL: https://chromiumcodereview.appspot.com/10693110 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
-rwxr-xr-xtesting/android/generate_native_test.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/testing/android/generate_native_test.py b/testing/android/generate_native_test.py
index 79f21d0..84780f0 100755
--- a/testing/android/generate_native_test.py
+++ b/testing/android/generate_native_test.py
@@ -1,4 +1,5 @@
-#!/usr/bin/python
+#!/usr/bin/env python
+#
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -24,7 +25,7 @@ import sys
# cmd_helper.py is under ../../build/android/
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..',
'..', 'build', 'android')))
-import cmd_helper # pylint: disable=F0401
+from pylib import cmd_helper # pylint: disable=F0401
class NativeTestApkGenerator(object):