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

Unified Diff: build/config/android/rules.gni

Issue 2473963003: Fix java target naming exceptions in third_party/ (Closed)
Patch Set: Created 4 years, 1 month 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/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index bf2f1491c7e58063c2390ecca71464c1d80a0061..e28e54b143e4b62f95d6047406f4a1ea4372c6b5 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1611,7 +1611,8 @@ if (enable_java_templates) {
# Added emma to the target's classpath via its .build_config.
if (emma_coverage && !_emma_never_instrument) {
- possible_config_deps += [ "//third_party/android_tools:emma_device" ]
+ possible_config_deps +=
+ [ "//third_party/android_tools:emma_device_java" ]
}
proguard_enabled = _proguard_enabled
@@ -1776,7 +1777,7 @@ if (enable_java_templates) {
deps += [ "${invoker.apk_under_test}__java" ]
}
if (emma_coverage && !_emma_never_instrument) {
- deps += [ "//third_party/android_tools:emma_device" ]
+ deps += [ "//third_party/android_tools:emma_device_java" ]
}
}

Powered by Google App Engine
This is Rietveld 408576698