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

Unified Diff: mojo/android/BUILD.gn

Issue 2123753005: Creating new gn arg: enable_all_proguard_optimizations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changing from 2 apks to gn arg which controls optimizations Created 4 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: mojo/android/BUILD.gn
diff --git a/mojo/android/BUILD.gn b/mojo/android/BUILD.gn
index 813701c85d0e5ce58af7ba729b5005de18d18257..325c6ce8cdc278bd907c6c3bd66ec50ff4a17968 100644
--- a/mojo/android/BUILD.gn
+++ b/mojo/android/BUILD.gn
@@ -8,9 +8,11 @@ group("android") {
testonly = true
deps = [
":mojo_javatests",
- ":mojo_test_apk",
":system_java",
]
+ if (!enable_all_proguard_optimizations) {
+ deps += [ ":mojo_test_apk" ]
+ }
}
generate_jni("jni_headers") {
@@ -130,16 +132,18 @@ shared_library("mojo_java_unittests") {
defines = [ "UNIT_TEST" ]
}
-instrumentation_test_apk("mojo_test_apk") {
- deps = [
- ":mojo_javatests",
- ":system_java",
- "//base:base_java",
- "//mojo/public/interfaces/bindings/tests:test_interfaces",
- "//mojo/public/java:bindings",
- ]
- shared_libraries = [ ":mojo_java_unittests" ]
- apk_name = "MojoTest"
- android_manifest = "javatests/AndroidManifest.xml"
- isolate_file = "../mojo_test_apk.isolate"
+if (!enable_all_proguard_optimizations) {
+ instrumentation_test_apk("mojo_test_apk") {
+ deps = [
+ ":mojo_javatests",
+ ":system_java",
+ "//base:base_java",
+ "//mojo/public/interfaces/bindings/tests:test_interfaces",
+ "//mojo/public/java:bindings",
+ ]
+ shared_libraries = [ ":mojo_java_unittests" ]
+ apk_name = "MojoTest"
+ android_manifest = "javatests/AndroidManifest.xml"
+ isolate_file = "../mojo_test_apk.isolate"
+ }
}

Powered by Google App Engine
This is Rietveld 408576698