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

Unified Diff: build/java_apk.gypi

Issue 250773005: Adding mojo_test_apk in the fyi waterfall. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix instrumentation issue. Created 6 years, 8 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/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index 33ff35d3ff4ece9e1a517645324559ae33569ef8..57af7efad012402fe5fab79c18b307089da18d98 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -133,9 +133,9 @@
'apk_package_native_libs_dir': '<(intermediate_dir)/libs',
}],
['is_test_apk == 0 and emma_coverage != 0', {
- 'emma_instrument': 1,
+ 'emma_instrument%': 1,
},{
- 'emma_instrument': 0,
+ 'emma_instrument%': 0,
}],
],
},
@@ -143,7 +143,7 @@
'native_lib_version_name%': '',
'use_chromium_linker%' : 0,
'enable_chromium_linker_tests%': 0,
- 'emma_instrument': '<(emma_instrument)',
+ 'emma_instrument%': '<(emma_instrument)',
'apk_package_native_libs_dir': '<(apk_package_native_libs_dir)',
'unsigned_standalone_apk_path': '<(unsigned_standalone_apk_path)',
'extra_native_libs': [],
@@ -654,8 +654,6 @@
'conditions': [
['emma_instrument != 0', {
'dex_no_locals': 1,
- }],
- ['emma_instrument != 0 and is_test_apk == 0', {
'dex_input_paths': [ '<(emma_device_jar)' ],
}],
],
« no previous file with comments | « build/android/buildbot/bb_run_bot.py ('k') | mojo/android/system/src/org/chromium/mojo/system/CoreImpl.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698