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

Unified Diff: chrome/android/BUILD.gn

Issue 2697933002: Remove factory methods from ChromeApplication. (Closed)
Patch Set: Add some comments Created 3 years, 10 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 da28944f6048ea6ec8e3982db50f47903c8a1913..9f1892bd245686ef845d96e9b034f35a86c367eb 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -150,6 +150,15 @@ java_strings_grd("chrome_strings_grd") {
]
}
+android_library("app_globals_java") {
+ java_files = [ app_globals_file ]
+ deps = [
+ ":chrome_java",
+ "//base:base_java",
+ "//components/signin/core/browser/android:java",
+ ]
+}
+
android_library("chrome_java") {
deps = [
":chrome_java_resources",
@@ -253,12 +262,19 @@ android_library("chrome_java") {
android_manifest = chrome_public_android_manifest
# From java_sources.gni.
- java_files = chrome_java_sources
+ java_files = chrome_java_sources + [ app_globals_file ]
if (enable_webvr) {
java_files += chrome_vr_java_sources
deps += [ "//third_party/gvr-android-sdk:gvr_common_java" ]
}
+
+ # Add the actual implementation where necessary so that downstream targets
+ # can provide their own implementations.
+ jar_excluded_patterns = [
+ "*/AppGlobals.class",
+ "*/AppGlobals\$*.class",
+ ]
}
action("chrome_android_java_google_api_keys_srcjar") {
@@ -309,6 +325,7 @@ junit_binary("chrome_junit_tests") {
# From java_sources.gni.
java_files = chrome_junit_test_java_sources
deps = [
+ ":app_globals_java",
":chrome_java",
":chrome_java_resources",
"//base:base_java",
@@ -379,6 +396,7 @@ android_library("chrome_test_java") {
deps = [
"//base:base_java",
"//base:base_java_test_support",
+ "//chrome/android:app_globals_java",
"//chrome/android:chrome_java",
"//chrome/android/webapk/libs/client:client_java",
"//chrome/android/webapk/libs/common:common_java",
@@ -469,6 +487,7 @@ android_library("chrome_test_vr_java") {
deps = [
"//base:base_java",
"//base:base_java_test_support",
+ "//chrome/android:app_globals_java",
"//chrome/android:chrome_java",
"//chrome/test/android:chrome_java_test_support",
"//components/policy/android:policy_java",
@@ -683,6 +702,7 @@ template("chrome_public_apk_tmpl_shared") {
}
deps += [
+ ":app_globals_java",
":chrome_java",
":chrome_public_apk_resources",
":chrome_public_non_pak_assets",
@@ -716,6 +736,7 @@ monochrome_public_apk_tmpl("monochrome_public_apk") {
deps = [
"//base:base_java",
+ "//chrome/android:app_globals_java",
"//chrome/android:chrome_java",
"//chrome/android/java/templates:public_monochrome_java",
]
@@ -807,6 +828,7 @@ android_library("chrome_sync_shell_test_apk_java") {
deps = [
"//base:base_java",
"//base:base_java_test_support",
+ "//chrome/android:app_globals_java",
"//chrome/android:chrome_java",
"//chrome/test/android:chrome_java_test_support",
"//components/bookmarks/common/android:bookmarks_java",

Powered by Google App Engine
This is Rietveld 408576698