Index: blimp/client/core/BUILD.gn |
diff --git a/blimp/client/core/BUILD.gn b/blimp/client/core/BUILD.gn |
index 6cfad7d81ed9062228f76ec7b994df16e2a71d32..e0ffd9b8f3cbeb53bc33db8ed2e8ad9829c5e96c 100644 |
--- a/blimp/client/core/BUILD.gn |
+++ b/blimp/client/core/BUILD.gn |
@@ -54,6 +54,7 @@ source_set("dummy_core") { |
deps = [ |
"//base", |
"//blimp/client/public:public_headers", |
+ "//google_apis", |
"//url", |
] |
@@ -72,21 +73,37 @@ source_set("unit_tests") { |
testonly = true |
sources = [ |
+ "authenticator_unittest.cc", |
"blimp_client_context_impl_unittest.cc", |
] |
deps = [ |
+ ":auth", |
":context", |
"//blimp/client/core/compositor:unit_tests", |
"//blimp/client/core/contents:unit_tests", |
"//blimp/client/core/session:unit_tests", |
"//blimp/client/public:public_headers", |
"//blimp/client/test", |
+ "//google_apis:test_support", |
"//testing/gmock", |
"//testing/gtest", |
] |
} |
+source_set("auth") { |
nyquist
2016/08/10 01:20:33
Could we move this into //blimp/client/core/sessio
xingliu
2016/08/10 21:03:14
Done.
|
+ sources = [ |
+ "authenticator.cc", |
+ "authenticator.h", |
+ ] |
+ |
+ public_deps = [ |
+ "//base", |
+ "//blimp/client/public:public_headers", |
+ "//google_apis", |
+ ] |
+} |
+ |
source_set("context") { |
sources = [ |
"blimp_client_context_impl.cc", |
@@ -94,6 +111,7 @@ source_set("context") { |
] |
public_deps = [ |
+ ":auth", |
"//base", |
"//blimp/client/core/contents", |
"//blimp/client/core/session", |
@@ -166,12 +184,23 @@ if (is_android) { |
] |
} |
+ android_library("common_java") { |
+ visibility = [ "//blimp/client/*" ] |
+ |
+ java_files = [ "android/java/src/org/chromium/blimp/core/common/PreferencesUtil.java" ] |
+ |
+ deps = [ |
+ "//base:base_java", |
+ ] |
+ } |
+ |
android_library("context_java") { |
visibility = [ "//blimp/client/*" ] |
java_files = [ "android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java" ] |
deps = [ |
+ ":common_java", |
"//base:base_java", |
"//blimp/client/core:settings_java", |
"//blimp/client/core/contents:contents_java", |
@@ -194,6 +223,7 @@ if (is_android) { |
# TODO(xingliu): Remove android support v7 dependency and move android resources to Chrome |
# after Blimp merge to Chrome. |
deps = [ |
+ ":common_java", |
"//base:base_java", |
"//blimp/client:blimp_java_resources", |
"//blimp/client/public:public_headers_java", |