Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 if (is_android) { | 5 if (is_android) { |
| 6 import("//build/config/android/config.gni") | 6 import("//build/config/android/config.gni") |
| 7 import("//build/config/android/rules.gni") | 7 import("//build/config/android/rules.gni") |
| 8 } | 8 } |
| 9 | 9 |
| 10 declare_args() { | 10 declare_args() { |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 47 visibility = [ ":*" ] | 47 visibility = [ ":*" ] |
| 48 | 48 |
| 49 sources = [ | 49 sources = [ |
| 50 "dummy_blimp_client_context.cc", | 50 "dummy_blimp_client_context.cc", |
| 51 "dummy_blimp_client_context.h", | 51 "dummy_blimp_client_context.h", |
| 52 ] | 52 ] |
| 53 | 53 |
| 54 deps = [ | 54 deps = [ |
| 55 "//base", | 55 "//base", |
| 56 "//blimp/client/public:public_headers", | 56 "//blimp/client/public:public_headers", |
| 57 "//google_apis", | |
| 57 "//url", | 58 "//url", |
| 58 ] | 59 ] |
| 59 | 60 |
| 60 if (is_android) { | 61 if (is_android) { |
| 61 sources += [ | 62 sources += [ |
| 62 "android/dummy_blimp_client_context_android.cc", | 63 "android/dummy_blimp_client_context_android.cc", |
| 63 "android/dummy_blimp_client_context_android.h", | 64 "android/dummy_blimp_client_context_android.h", |
| 64 "android/dummy_blimp_jni_registrar.cc", | 65 "android/dummy_blimp_jni_registrar.cc", |
| 65 ] | 66 ] |
| 66 | 67 |
| 67 deps += [ ":dummy_core_jni_headers" ] | 68 deps += [ ":dummy_core_jni_headers" ] |
| 68 } | 69 } |
| 69 } | 70 } |
| 70 | 71 |
| 71 source_set("unit_tests") { | 72 source_set("unit_tests") { |
| 72 testonly = true | 73 testonly = true |
| 73 | 74 |
| 74 sources = [ | 75 sources = [ |
| 76 "authenticator_unittest.cc", | |
| 75 "blimp_client_context_impl_unittest.cc", | 77 "blimp_client_context_impl_unittest.cc", |
| 76 ] | 78 ] |
| 77 | 79 |
| 78 deps = [ | 80 deps = [ |
| 81 ":auth", | |
| 79 ":context", | 82 ":context", |
| 80 "//blimp/client/core/compositor:unit_tests", | 83 "//blimp/client/core/compositor:unit_tests", |
| 81 "//blimp/client/core/contents:unit_tests", | 84 "//blimp/client/core/contents:unit_tests", |
| 82 "//blimp/client/core/session:unit_tests", | 85 "//blimp/client/core/session:unit_tests", |
| 83 "//blimp/client/public:public_headers", | 86 "//blimp/client/public:public_headers", |
| 84 "//blimp/client/test", | 87 "//blimp/client/test", |
| 88 "//google_apis:test_support", | |
| 85 "//testing/gmock", | 89 "//testing/gmock", |
| 86 "//testing/gtest", | 90 "//testing/gtest", |
| 87 ] | 91 ] |
| 88 } | 92 } |
| 89 | 93 |
| 94 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.
| |
| 95 sources = [ | |
| 96 "authenticator.cc", | |
| 97 "authenticator.h", | |
| 98 ] | |
| 99 | |
| 100 public_deps = [ | |
| 101 "//base", | |
| 102 "//blimp/client/public:public_headers", | |
| 103 "//google_apis", | |
| 104 ] | |
| 105 } | |
| 106 | |
| 90 source_set("context") { | 107 source_set("context") { |
| 91 sources = [ | 108 sources = [ |
| 92 "blimp_client_context_impl.cc", | 109 "blimp_client_context_impl.cc", |
| 93 "blimp_client_context_impl.h", | 110 "blimp_client_context_impl.h", |
| 94 ] | 111 ] |
| 95 | 112 |
| 96 public_deps = [ | 113 public_deps = [ |
| 114 ":auth", | |
| 97 "//base", | 115 "//base", |
| 98 "//blimp/client/core/contents", | 116 "//blimp/client/core/contents", |
| 99 "//blimp/client/core/session", | 117 "//blimp/client/core/session", |
| 100 "//blimp/client/public:public_headers", | 118 "//blimp/client/public:public_headers", |
| 101 ] | 119 ] |
| 102 | 120 |
| 103 if (is_android) { | 121 if (is_android) { |
| 104 sources += [ | 122 sources += [ |
| 105 "android/blimp_client_context_impl_android.cc", | 123 "android/blimp_client_context_impl_android.cc", |
| 106 "android/blimp_client_context_impl_android.h", | 124 "android/blimp_client_context_impl_android.h", |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 159 visibility = [ ":*" ] | 177 visibility = [ ":*" ] |
| 160 | 178 |
| 161 java_files = [ "android/java/src/org/chromium/blimp/core/DummyBlimpClientCon text.java" ] | 179 java_files = [ "android/java/src/org/chromium/blimp/core/DummyBlimpClientCon text.java" ] |
| 162 | 180 |
| 163 deps = [ | 181 deps = [ |
| 164 "//base:base_java", | 182 "//base:base_java", |
| 165 "//blimp/client/public:public_headers_java", | 183 "//blimp/client/public:public_headers_java", |
| 166 ] | 184 ] |
| 167 } | 185 } |
| 168 | 186 |
| 187 android_library("common_java") { | |
| 188 visibility = [ "//blimp/client/*" ] | |
| 189 | |
| 190 java_files = [ "android/java/src/org/chromium/blimp/core/common/PreferencesU til.java" ] | |
| 191 | |
| 192 deps = [ | |
| 193 "//base:base_java", | |
| 194 ] | |
| 195 } | |
| 196 | |
| 169 android_library("context_java") { | 197 android_library("context_java") { |
| 170 visibility = [ "//blimp/client/*" ] | 198 visibility = [ "//blimp/client/*" ] |
| 171 | 199 |
| 172 java_files = [ "android/java/src/org/chromium/blimp/core/BlimpClientContextI mpl.java" ] | 200 java_files = [ "android/java/src/org/chromium/blimp/core/BlimpClientContextI mpl.java" ] |
| 173 | 201 |
| 174 deps = [ | 202 deps = [ |
| 203 ":common_java", | |
| 175 "//base:base_java", | 204 "//base:base_java", |
| 176 "//blimp/client/core:settings_java", | 205 "//blimp/client/core:settings_java", |
| 177 "//blimp/client/core/contents:contents_java", | 206 "//blimp/client/core/contents:contents_java", |
| 178 "//blimp/client/public:public_headers_java", | 207 "//blimp/client/public:public_headers_java", |
| 179 ] | 208 ] |
| 180 } | 209 } |
| 181 | 210 |
| 182 android_library("switches_java") { | 211 android_library("switches_java") { |
| 183 visibility = [ "//blimp/client/*" ] | 212 visibility = [ "//blimp/client/*" ] |
| 184 | 213 |
| 185 java_files = | 214 java_files = |
| 186 [ "android/java/src/org/chromium/blimp/core/BlimpClientSwitches.java" ] | 215 [ "android/java/src/org/chromium/blimp/core/BlimpClientSwitches.java" ] |
| 187 } | 216 } |
| 188 | 217 |
| 189 android_library("settings_java") { | 218 android_library("settings_java") { |
| 190 visibility = [ "//blimp/client/*" ] | 219 visibility = [ "//blimp/client/*" ] |
| 191 | 220 |
| 192 java_files = [ "android/java/src/org/chromium/blimp/core/settings/AboutBlimp Preferences.java" ] | 221 java_files = [ "android/java/src/org/chromium/blimp/core/settings/AboutBlimp Preferences.java" ] |
| 193 | 222 |
| 194 # TODO(xingliu): Remove android support v7 dependency and move android resou rces to Chrome | 223 # TODO(xingliu): Remove android support v7 dependency and move android resou rces to Chrome |
| 195 # after Blimp merge to Chrome. | 224 # after Blimp merge to Chrome. |
| 196 deps = [ | 225 deps = [ |
| 226 ":common_java", | |
| 197 "//base:base_java", | 227 "//base:base_java", |
| 198 "//blimp/client:blimp_java_resources", | 228 "//blimp/client:blimp_java_resources", |
| 199 "//blimp/client/public:public_headers_java", | 229 "//blimp/client/public:public_headers_java", |
| 200 "//third_party/android_tools:android_support_v7_appcompat_java", | 230 "//third_party/android_tools:android_support_v7_appcompat_java", |
| 201 ] | 231 ] |
| 202 } | 232 } |
| 203 | 233 |
| 204 generate_jni("context_jni_headers") { | 234 generate_jni("context_jni_headers") { |
| 205 visibility = [ ":*" ] | 235 visibility = [ ":*" ] |
| 206 | 236 |
| 207 sources = [ | 237 sources = [ |
| 208 "android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java", | 238 "android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java", |
| 209 ] | 239 ] |
| 210 | 240 |
| 211 jni_package = "blimp/client/core" | 241 jni_package = "blimp/client/core" |
| 212 } | 242 } |
| 213 | 243 |
| 214 generate_jni("dummy_core_jni_headers") { | 244 generate_jni("dummy_core_jni_headers") { |
| 215 visibility = [ ":*" ] | 245 visibility = [ ":*" ] |
| 216 | 246 |
| 217 sources = [ | 247 sources = [ |
| 218 "android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java", | 248 "android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java", |
| 219 ] | 249 ] |
| 220 | 250 |
| 221 jni_package = "blimp/client/core" | 251 jni_package = "blimp/client/core" |
| 222 } | 252 } |
| 223 } | 253 } |
| OLD | NEW |