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

Unified Diff: chrome/android/BUILD.gn

Issue 2132163002: Add BlimpClientContext and factory with real and dummy implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move-blimp-client-core-public-to-blimp-client
Patch Set: Added delegate-support to BlimpClientContext 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: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 75e6228e2541b9821dac54a3102a817da1ac3dc7..426a12b1527153272e4f0bbacc2df9ed73010635 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//blimp/blimp.gni")
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
import("//build_overrides/v8.gni")
@@ -14,11 +15,6 @@ import("//third_party/protobuf/proto_library.gni")
import("channel.gni")
import("java_sources.gni")
-declare_args() {
- # Enables blimp for android.
- enable_blimp = false
-}
-
manifest_package = "org.chromium.chrome"
chrome_public_jinja_variables = default_chrome_public_jinja_variables +
@@ -227,6 +223,7 @@ android_library("chrome_java") {
deps += [
":chrome_java_resources",
":document_tab_model_info_proto_java",
+ "//blimp/client/public:public_java",
"//components/bookmarks/common/android:bookmarks_java",
"//components/dom_distiller/android:dom_distiller_content_java",
"//components/dom_distiller/android:dom_distiller_core_java",
@@ -242,6 +239,12 @@ android_library("chrome_java") {
"//components/web_contents_delegate_android:web_contents_delegate_android_java",
"//sync/android:sync_java",
]
+
+ if (enable_blimp) {
+ deps += [ "//blimp/client/core:core_java" ]
+ } else {
+ deps += [ "//blimp/client/dummy:dummy_java" ]
+ }
}
}

Powered by Google App Engine
This is Rietveld 408576698