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

Unified Diff: chrome/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: Rebased again 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
« no previous file with comments | « build/config/android/rules.gni ('k') | chrome/android/chrome_public_apk_tmpl.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 31efb82bd1070b3a90fd98018e8dc94b8638772c..39c5f3a0e34f203b0d7314c413ee3ab2a65dff89 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -552,25 +552,27 @@ jinja_template("chrome_sync_shell_test_apk_manifest") {
variables = chrome_sync_shell_jinja_variables
}
-# GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk
-instrumentation_test_apk("chrome_public_test_apk") {
- apk_name = "ChromePublicTest"
- apk_under_test = ":chrome_public_apk"
- android_manifest = chrome_public_test_apk_manifest
- android_manifest_dep = ":chrome_public_test_apk_manifest"
+if (!enable_all_proguard_optimizations) {
+ # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk
+ instrumentation_test_apk("chrome_public_test_apk") {
+ apk_name = "ChromePublicTest"
+ apk_under_test = ":chrome_public_apk"
+ android_manifest = chrome_public_test_apk_manifest
+ android_manifest_dep = ":chrome_public_test_apk_manifest"
- deps = [
- ":chrome_test_java",
- "//chrome/android/webapk/libs/runtime_library:runtime_library_javatests",
- "//chrome/android/webapk/shell_apk:shell_apk_javatests",
- ]
- additional_apks = [
- "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk",
- "//chrome/test/android/chrome_public_test_support:chrome_public_test_support_apk",
- "//net/android:net_test_support_apk",
- ]
- isolate_file = "../chrome_public_test_apk.isolate"
- proguard_enabled = !is_java_debug
+ deps = [
+ ":chrome_test_java",
+ "//chrome/android/webapk/libs/runtime_library:runtime_library_javatests",
+ "//chrome/android/webapk/shell_apk:shell_apk_javatests",
+ ]
+ additional_apks = [
+ "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk",
+ "//chrome/test/android/chrome_public_test_support:chrome_public_test_support_apk",
+ "//net/android:net_test_support_apk",
+ ]
+ isolate_file = "../chrome_public_test_apk.isolate"
+ proguard_enabled = !is_java_debug
+ }
}
android_library("chrome_sync_shell_test_apk_java") {
@@ -598,14 +600,16 @@ android_library("chrome_sync_shell_test_apk_java") {
]
}
-# GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk
-instrumentation_test_apk("chrome_sync_shell_test_apk") {
- apk_name = "ChromeSyncShellTest"
- apk_under_test = ":chrome_sync_shell_apk"
- android_manifest = chrome_sync_shell_test_apk_manifest
- android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
- deps = [
- ":chrome_sync_shell_test_apk_java",
- ]
- proguard_enabled = !is_java_debug
+if (!enable_all_proguard_optimizations) {
+ # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk
+ instrumentation_test_apk("chrome_sync_shell_test_apk") {
+ apk_name = "ChromeSyncShellTest"
+ apk_under_test = ":chrome_sync_shell_apk"
+ android_manifest = chrome_sync_shell_test_apk_manifest
+ android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
+ deps = [
+ ":chrome_sync_shell_test_apk_java",
+ ]
+ proguard_enabled = !is_java_debug
+ }
}
« no previous file with comments | « build/config/android/rules.gni ('k') | chrome/android/chrome_public_apk_tmpl.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698