Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Unified Diff: testing/android/generate_native_test.py

Issue 11066094: Nuke unused test code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nuke more test code. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/apk_test.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/android/generate_native_test.py
diff --git a/testing/android/generate_native_test.py b/testing/android/generate_native_test.py
index aff4f70df2fd66b27c2a40f6395b3542bd10247c..169ea6693077210f6ecbaf199f9f925254ea2741 100755
--- a/testing/android/generate_native_test.py
+++ b/testing/android/generate_native_test.py
@@ -130,11 +130,8 @@ class NativeTestApkGenerator(object):
logging.warn('%s --> %s', jar, dest)
shutil.copyfile(jar, dest)
- def CreateBundle(self, sdk_build):
+ def CreateBundle(self):
"""Create the apk bundle source and assemble components."""
- if not sdk_build:
- self._SOURCE_FILES.append('Android.mk')
- self._REPLACEME_FILES.append('Android.mk')
self._CopyTemplateFilesAndClearDir()
self._ReplaceStrings()
self._CopyLibraryAndJars()
@@ -159,17 +156,6 @@ class NativeTestApkGenerator(object):
logging.error('Ant return code %d', p.returncode)
sys.exit(p.returncode)
- def CompileAndroidMk(self):
- """Build the generated apk within Android source tree using Android.mk."""
- try:
- import compile_android_mk # pylint: disable=F0401
- except:
- raise AssertionError('Not in Android source tree. '
- 'Please use --sdk-build.')
- compile_android_mk.CompileAndroidMk(self._native_library,
- self._output_directory)
-
-
def main(argv):
parser = optparse.OptionParser()
parser.add_option('--verbose',
@@ -217,13 +203,8 @@ def main(argv):
strip_binary=options.strip_binary,
output_directory=options.output,
target_abi=options.app_abi)
- ntag.CreateBundle(options.sdk_build)
-
- if options.sdk_build:
- ntag.Compile(options.ant_args)
- else:
- ntag.CompileAndroidMk()
-
+ ntag.CreateBundle()
+ ntag.Compile(options.ant_args)
logging.warn('COMPLETE.')
if __name__ == '__main__':
« no previous file with comments | « build/apk_test.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698