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

Unified Diff: build/android/gyp/dex.py

Issue 20210002: [Android] Sets up a coverage system for java using EMMA (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Gets code coverage for non-apk java working Created 7 years, 5 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: build/android/gyp/dex.py
diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py
index 86f3878f7f0d4b456906d32745916b807918f415..d974543eaacb89263253d0e8ecd7a74b80e9e3ed 100755
--- a/build/android/gyp/dex.py
+++ b/build/android/gyp/dex.py
@@ -15,7 +15,10 @@ from util import md5_check
def DoDex(options, paths):
dx_binary = os.path.join(options.android_sdk_root, 'platform-tools', 'dx')
- dex_cmd = [dx_binary, '--dex', '--output', options.dex_path] + paths
+ dex_cmd = [dx_binary, '--dex', '--output', options.dex_path]
+ if options.no_locals:
+ dex_cmd.append('--no-locals')
+ dex_cmd += paths
record_path = '%s.md5.stamp' % options.dex_path
md5_check.CallAndRecordIfStale(
@@ -32,11 +35,14 @@ def main(argv):
parser.add_option('--android-sdk-root', help='Android sdk root directory.')
parser.add_option('--dex-path', help='Dex output path.')
parser.add_option('--configuration-name',
- help='The build CONFIGURATION_NAME.')
+ help='The build CONFIGURATION_NAME.')
parser.add_option('--proguard-enabled',
- help='"true" if proguard is enabled.')
+ help='"true" if proguard is enabled.')
parser.add_option('--proguard-enabled-input-path',
- help='Path to dex in Release mode when proguard is enabled.')
+ help=('Path to dex in Release mode when proguard '
+ 'is enabled.'))
+ parser.add_option('--no-locals',
+ help='Exclude locals list from the dex file.')
parser.add_option('--stamp', help='Path to touch on success.')
# TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.

Powered by Google App Engine
This is Rietveld 408576698