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

Unified Diff: components/cronet/tools/cr_cronet.py

Issue 512953002: Use proguard.cfg in cronet sample apk. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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
Index: components/cronet/tools/cr_cronet.py
diff --git a/components/cronet/tools/cr_cronet.py b/components/cronet/tools/cr_cronet.py
index ae971442e0fddad414b2525e024eba1a6fa0ade8..235d9906abb2d4d160436e621e7201ef581d946f 100755
--- a/components/cronet/tools/cr_cronet.py
+++ b/components/cronet/tools/cr_cronet.py
@@ -18,31 +18,38 @@ def run(command):
def main():
parser = argparse.ArgumentParser()
parser.add_argument('command',
- choices=['init',
+ choices=['gyp',
'sync',
'build',
'install',
'test',
'debug'])
+ parser.add_argument('-r', '--release', action='store_true',
+ help='use release configuration')
options = parser.parse_args()
print options
- print options.command
gyp_defines = 'GYP_DEFINES="OS=android enable_websockets=0 '+ \
'disable_file_support=1 disable_ftp_support=1 '+ \
'use_icu_alternatives_on_android=1" '
+ out = 'out/Debug'
xunjieli 2014/08/28 15:35:04 nit: can this variable be sth like "out_dir" ?
mef 2014/08/31 21:34:39 Done.
+ release_arg = ''
+ if options.release:
+ out = 'out/Release'
+ release_arg = ' --release '
- if (options.command=='init'):
+ if (options.command=='gyp'):
return run (gyp_defines + ' gclient runhooks')
if (options.command=='sync'):
return run ('git pull --rebase && ' + gyp_defines + ' gclient sync')
if (options.command=='build'):
- return run ('ninja -C out/Debug cronet_sample_test_apk')
+ return run ('ninja -C ' + out + ' cronet_sample_test_apk')
if (options.command=='install'):
- return run ('build/android/adb_install_apk.py --apk=CronetSample.apk')
+ return run ('build/android/adb_install_apk.py ' + release_arg + \
+ '--apk=CronetSample.apk')
mmenke 2014/08/28 17:26:36 Should these args have leading spaces? release_ar
mef 2014/08/31 21:34:39 Done.
if (options.command=='test'):
return run ('build/android/test_runner.py instrumentation '+ \
- '--test-apk=CronetSampleTest')
+ release_arg + '--test-apk=CronetSampleTest')
parser.print_help()
return 1

Powered by Google App Engine
This is Rietveld 408576698