diff options
| author | agrieve <agrieve@chromium.org> | 2016-02-29 12:06:13 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-29 20:07:29 +0000 |
| commit | 9a6ba5e0f6a2c6a5626d9203ca6cd6497aa5cb45 (patch) | |
| tree | 8c91ba277d9aa4caea56011cb1c0743709447a14 | |
| parent | 8a6d846970a3f425e754fea88cc96cc78c19ab83 (diff) | |
| download | chromium_src-9a6ba5e0f6a2c6a5626d9203ca6cd6497aa5cb45.zip chromium_src-9a6ba5e0f6a2c6a5626d9203ca6cd6497aa5cb45.tar.gz chromium_src-9a6ba5e0f6a2c6a5626d9203ca6cd6497aa5cb45.tar.bz2 | |
Make _incremental targets work with emma_coverage=true
BUG=587986
Review URL: https://codereview.chromium.org/1711253002
Cr-Commit-Position: refs/heads/master@{#378251}
| -rw-r--r-- | build/android/incremental_install/BUILD.gn | 1 | ||||
| -rw-r--r-- | build/config/android/internal_rules.gni | 4 | ||||
| -rw-r--r-- | build/config/android/rules.gni | 10 | ||||
| -rw-r--r-- | build/secondary/third_party/android_tools/BUILD.gn | 4 |
4 files changed, 12 insertions, 7 deletions
diff --git a/build/android/incremental_install/BUILD.gn b/build/android/incremental_install/BUILD.gn index ab39e4c..4fc9a35 100644 --- a/build/android/incremental_install/BUILD.gn +++ b/build/android/incremental_install/BUILD.gn @@ -14,4 +14,5 @@ android_library("bootstrap_java") { "java/org/chromium/incrementalinstall/LockFile.java", "java/org/chromium/incrementalinstall/Reflect.java", ] + emma_never_instrument = true } diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni index 528fd0c..73b98e4 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni @@ -310,7 +310,8 @@ template("dex") { args += [ "--incremental" ] } - if (defined(invoker.no_locals) && invoker.no_locals) { + # EMMA requires --no-locals. + if (emma_coverage) { args += [ "--no-locals=1" ] } @@ -1743,7 +1744,6 @@ template("java_library_impl") { _jar_path, ] output = _dex_path - no_locals = _emma_instrument deps = [ ":$_compile_java_target", ] diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni index 49ccc1d..7f57b03 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -1450,6 +1450,11 @@ template("android_apk") { has_alternative_locale_resource = true } + # Added emma to the target's classpath via its .build_config. + if (emma_coverage && !_emma_never_instrument) { + deps += [ "//third_party/android_tools:emma_device" ] + } + proguard_enabled = _proguard_enabled if (_proguard_enabled) { proguard_info = "$_proguard_jar_path.info" @@ -1676,11 +1681,6 @@ template("android_apk") { } args = [ "--inputs=@FileArg($_dex_arg_key)" ] } - - if (emma_coverage && !_emma_never_instrument) { - no_locals = true - sources += [ "$android_sdk_root/tools/lib/emma_device.jar" ] - } } _native_libs_file_arg_dep = ":$build_config_target" diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn index e256258..ba4f498 100644 --- a/build/secondary/third_party/android_tools/BUILD.gn +++ b/build/secondary/third_party/android_tools/BUILD.gn @@ -36,6 +36,10 @@ android_java_prebuilt("android_gcm_java") { jar_path = "$android_sdk_root/extras/google/gcm/gcm-client/dist/gcm.jar" } +android_java_prebuilt("emma_device") { + jar_path = "$android_sdk_root/tools/lib/emma_device.jar" +} + android_java_prebuilt("uiautomator_java") { jar_path = "$android_sdk/uiautomator.jar" } |