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

Unified Diff: blimp/client/core/BUILD.gn

Issue 2173563003: Blimp settings UI integration for Chrome, everything still lives in Blimp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nit issues, and prepare to commit. 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: blimp/client/core/BUILD.gn
diff --git a/blimp/client/core/BUILD.gn b/blimp/client/core/BUILD.gn
index 42e10c87665abb6e4ba464cccf7955653915d8d1..8877084fae5de4f7737dbfcd0e1599aabbdc0bcb 100644
--- a/blimp/client/core/BUILD.gn
+++ b/blimp/client/core/BUILD.gn
@@ -147,6 +147,7 @@ if (is_android) {
deps = [
":context_java",
+ ":settings_java",
":switches_java",
"//blimp/client/core/contents:contents_java",
]
@@ -170,6 +171,7 @@ if (is_android) {
deps = [
"//base:base_java",
+ "//blimp/client/core:settings_java",
"//blimp/client/core/contents:contents_java",
"//blimp/client/public:public_headers_java",
]
@@ -182,6 +184,21 @@ if (is_android) {
[ "android/java/src/org/chromium/blimp/core/BlimpClientSwitches.java" ]
}
+ android_library("settings_java") {
+ visibility = [ "//blimp/client/*" ]
+
+ java_files = [ "android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.java" ]
+
+ # TODO(xingliu): Remove android support v7 dependency and move android resources to Chrome
+ # after Blimp merge to Chrome.
+ deps = [
+ "//base:base_java",
+ "//blimp/client:blimp_java_resources",
+ "//blimp/client/public:public_headers_java",
+ "//third_party/android_tools:android_support_v7_appcompat_java",
+ ]
+ }
+
generate_jni("context_jni_headers") {
visibility = [ ":*" ]

Powered by Google App Engine
This is Rietveld 408576698