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

Side by Side Diff: blimp/client/BUILD.gn

Issue 1687393002: Add assigner support to Blimp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Build the ProxyConfigService on the main thread. Created 4 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 unified diff | Download patch
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 import("//build/config/ui.gni") 5 import("//build/config/ui.gni")
6 6
7 if (is_android) { 7 if (is_android) {
8 import("//build/config/android/config.gni") 8 import("//build/config/android/config.gni")
9 import("//build/config/android/rules.gni") 9 import("//build/config/android/rules.gni")
10 } 10 }
(...skipping 25 matching lines...) Expand all
36 "//blimp/common/proto", 36 "//blimp/common/proto",
37 "//blimp/net:blimp_net", 37 "//blimp/net:blimp_net",
38 "//cc", 38 "//cc",
39 "//gpu/skia_bindings", 39 "//gpu/skia_bindings",
40 "//net", 40 "//net",
41 "//ui/gfx/geometry", 41 "//ui/gfx/geometry",
42 "//url:url", 42 "//url:url",
43 ] 43 ]
44 } 44 }
45 45
46 source_set("blimp_client_unit_tests") {
47 testonly = true
48
49 sources = [
50 "session/assignment_source_unittest.cc",
51 ]
52
53 deps = [
54 ":blimp_client",
55 "//base",
56 "//base/test:run_all_unittests",
57 "//base/test:test_support",
58 "//testing/gmock",
59 "//testing/gtest",
60 ]
61 }
62
46 source_set("app_unit_tests") { 63 source_set("app_unit_tests") {
47 testonly = true 64 testonly = true
48 65
49 sources = [ 66 sources = [
50 "app/blimp_discardable_memory_allocator_unittest.cc", 67 "app/blimp_discardable_memory_allocator_unittest.cc",
51 ] 68 ]
52 69
53 deps = [ 70 deps = [
54 ":blimp_client", 71 ":blimp_client",
55 "//base", 72 "//base",
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 "values-sw/android_blimp_strings.xml", 265 "values-sw/android_blimp_strings.xml",
249 "values-th/android_blimp_strings.xml", 266 "values-th/android_blimp_strings.xml",
250 "values-tr/android_blimp_strings.xml", 267 "values-tr/android_blimp_strings.xml",
251 "values-uk/android_blimp_strings.xml", 268 "values-uk/android_blimp_strings.xml",
252 "values-vi/android_blimp_strings.xml", 269 "values-vi/android_blimp_strings.xml",
253 "values-zh-rCN/android_blimp_strings.xml", 270 "values-zh-rCN/android_blimp_strings.xml",
254 "values-zh-rTW/android_blimp_strings.xml", 271 "values-zh-rTW/android_blimp_strings.xml",
255 ] 272 ]
256 } 273 }
257 274
275 java_cpp_enum("blimp_java_enums_srcjar") {
276 sources = [
277 "session/assignment_source.h",
278 ]
279 }
280
258 android_library("blimp_java") { 281 android_library("blimp_java") {
282 srcjar_deps = [ ":blimp_java_enums_srcjar" ]
283
259 deps = [ 284 deps = [
260 ":blimp_java_resources", 285 ":blimp_java_resources",
261 "//base:base_java", 286 "//base:base_java",
262 287
263 # TODO(dtrainor): Remove the ui_java target once no more Android Toast 288 # TODO(dtrainor): Remove the ui_java target once no more Android Toast
264 # notifications are used. 289 # notifications are used.
265 "//ui/android:ui_java", 290 "//ui/android:ui_java",
266 google_play_services_library, 291 google_play_services_library,
267 ] 292 ]
268 293
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 libs = [ "android" ] 357 libs = [ "android" ]
333 } 358 }
334 359
335 android_apk("blimp_apk") { 360 android_apk("blimp_apk") {
336 deps = [ 361 deps = [
337 ":blimp_apk_manifest", 362 ":blimp_apk_manifest",
338 ":blimp_client_android", 363 ":blimp_client_android",
339 ":blimp_java", 364 ":blimp_java",
340 ":blimp_java_resources", 365 ":blimp_java_resources",
341 "//base:base_java", 366 "//base:base_java",
367 "//net/android:net_java",
342 google_play_services_resources, 368 google_play_services_resources,
343 ] 369 ]
344 apk_name = "Blimp" 370 apk_name = "Blimp"
345 android_manifest = blimp_apk_manifest 371 android_manifest = blimp_apk_manifest
346 native_libs = [ "libblimp_client_android.so" ] 372 native_libs = [ "libblimp_client_android.so" ]
347 } 373 }
348 374
349 instrumentation_test_apk("blimp_test_apk") { 375 instrumentation_test_apk("blimp_test_apk") {
350 apk_name = "BlimpTest" 376 apk_name = "BlimpTest"
351 apk_under_test = ":blimp_apk" 377 apk_under_test = ":blimp_apk"
352 android_manifest = blimp_test_apk_manifest 378 android_manifest = blimp_test_apk_manifest
353 deps = [ 379 deps = [
354 ":blimp_test_apk_manifest", 380 ":blimp_test_apk_manifest",
355 ":blimp_test_java", 381 ":blimp_test_java",
356 google_play_services_resources, 382 google_play_services_resources,
357 ] 383 ]
358 } 384 }
359 } 385 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698