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

Unified Diff: chrome/android/BUILD.gn

Issue 2790063006: [WIP] Adding Mockito support in Android instrumentation tests (Closed)
Patch Set: disable multidex for debug builds Created 3 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: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 67f70c1eb1489bd2bf078811f8cd65d5d000b9cd..08bddecbbe114f8c20b778279297d57c896f6bfb 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -470,6 +470,8 @@ android_library("chrome_test_java") {
"//third_party/hamcrest:hamcrest_java",
"//third_party/jsr-305:jsr_305_javalib",
"//third_party/junit",
+ "//third_party/mockito:mockito_android_java",
+ "//third_party/mockito:mockito_java",
"//ui/android:ui_java",
"//ui/android:ui_javatests",
"//ui/base/mojo:mojo_bindings_java",
@@ -857,6 +859,9 @@ instrumentation_test_apk("chrome_public_test_apk") {
"//net/android:net_test_support_apk",
]
proguard_enabled = !is_java_debug
+ if (proguard_enabled) {
+ enable_multidex = true
+ }
}
if (enable_vr) {
« no previous file with comments | « DEPS ('k') | chrome/android/java_sources.gni » ('j') | third_party/mockito/proguard.flags » ('J')

Powered by Google App Engine
This is Rietveld 408576698