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

Unified Diff: BUILD.gn

Issue 2182303002: Merging under test java into instrumentation test java. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@runtimelibrary
Patch Set: Cleaning up for review 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 | « no previous file | base/android/base_proguard_config.flags » ('j') | base/android/base_proguard_config.flags » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 8bf24cc9db7cd7eb26121c8bb2606070fb0ca382..779b9eb7623c0d30eabb7cd65c77cff25a492c9c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -409,16 +409,12 @@ group("both_gn_and_gyp") {
"//android_webview/tools/system_webview_shell",
"//chrome/android:chrome_junit_tests",
"//chrome/android:chrome_public_apk",
+ "//chrome/android:chrome_public_test_apk",
+ "//chrome/android:chrome_sync_shell_test_apk",
"//chrome/test/chromedriver/test/webview_shell:chromedriver_webview_shell_apk",
"//content/shell/android:content_shell_test_apk",
"//third_party/custom_tabs_client:custom_tabs_client_example_apk",
]
- if (!enable_all_proguard_optimizations) {
- deps += [
- "//chrome/android:chrome_public_test_apk",
- "//chrome/android:chrome_sync_shell_test_apk",
- ]
- }
}
if (target_cpu != "x64") {
« no previous file with comments | « no previous file | base/android/base_proguard_config.flags » ('j') | base/android/base_proguard_config.flags » ('J')

Powered by Google App Engine
This is Rietveld 408576698