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

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: Fix evil build break? 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
« no previous file with comments | « blimp/BUILD.gn ('k') | blimp/client/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 26 matching lines...) Expand all
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 "//third_party/libwebp", 41 "//third_party/libwebp",
42 "//ui/gfx/geometry", 42 "//ui/gfx/geometry",
43 "//url:url", 43 "//url:url",
44 ] 44 ]
45 } 45 }
46 46
47 source_set("blimp_client_unit_tests") {
48 testonly = true
49
50 sources = [
51 "session/assignment_source_unittest.cc",
52 ]
53
54 deps = [
55 ":blimp_client",
56 "//base",
57 "//base/test:run_all_unittests",
58 "//base/test:test_support",
59 "//testing/gmock",
60 "//testing/gtest",
61 ]
62 }
63
47 source_set("app_unit_tests") { 64 source_set("app_unit_tests") {
48 testonly = true 65 testonly = true
49 66
50 sources = [ 67 sources = [
51 "app/blimp_discardable_memory_allocator_unittest.cc", 68 "app/blimp_discardable_memory_allocator_unittest.cc",
52 ] 69 ]
53 70
54 deps = [ 71 deps = [
55 ":blimp_client", 72 ":blimp_client",
56 "//base", 73 "//base",
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 "values-sw/android_blimp_strings.xml", 268 "values-sw/android_blimp_strings.xml",
252 "values-th/android_blimp_strings.xml", 269 "values-th/android_blimp_strings.xml",
253 "values-tr/android_blimp_strings.xml", 270 "values-tr/android_blimp_strings.xml",
254 "values-uk/android_blimp_strings.xml", 271 "values-uk/android_blimp_strings.xml",
255 "values-vi/android_blimp_strings.xml", 272 "values-vi/android_blimp_strings.xml",
256 "values-zh-rCN/android_blimp_strings.xml", 273 "values-zh-rCN/android_blimp_strings.xml",
257 "values-zh-rTW/android_blimp_strings.xml", 274 "values-zh-rTW/android_blimp_strings.xml",
258 ] 275 ]
259 } 276 }
260 277
278 java_cpp_enum("blimp_java_enums_srcjar") {
279 sources = [
280 "session/assignment_source.h",
281 ]
282 }
283
261 android_library("blimp_java") { 284 android_library("blimp_java") {
285 srcjar_deps = [ ":blimp_java_enums_srcjar" ]
286
262 deps = [ 287 deps = [
263 ":blimp_java_resources", 288 ":blimp_java_resources",
264 "//base:base_java", 289 "//base:base_java",
265 290
266 # TODO(dtrainor): Remove the ui_java target once no more Android Toast 291 # TODO(dtrainor): Remove the ui_java target once no more Android Toast
267 # notifications are used. 292 # notifications are used.
268 "//ui/android:ui_java", 293 "//ui/android:ui_java",
269 google_play_services_library, 294 google_play_services_library,
270 ] 295 ]
271 296
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 libs = [ "android" ] 360 libs = [ "android" ]
336 } 361 }
337 362
338 android_apk("blimp_apk") { 363 android_apk("blimp_apk") {
339 deps = [ 364 deps = [
340 ":blimp_apk_manifest", 365 ":blimp_apk_manifest",
341 ":blimp_client_android", 366 ":blimp_client_android",
342 ":blimp_java", 367 ":blimp_java",
343 ":blimp_java_resources", 368 ":blimp_java_resources",
344 "//base:base_java", 369 "//base:base_java",
370 "//net/android:net_java",
345 google_play_services_resources, 371 google_play_services_resources,
346 ] 372 ]
347 apk_name = "Blimp" 373 apk_name = "Blimp"
348 android_manifest = blimp_apk_manifest 374 android_manifest = blimp_apk_manifest
349 native_libs = [ "libblimp_client_android.so" ] 375 native_libs = [ "libblimp_client_android.so" ]
350 } 376 }
351 377
352 instrumentation_test_apk("blimp_test_apk") { 378 instrumentation_test_apk("blimp_test_apk") {
353 apk_name = "BlimpTest" 379 apk_name = "BlimpTest"
354 apk_under_test = ":blimp_apk" 380 apk_under_test = ":blimp_apk"
355 android_manifest = blimp_test_apk_manifest 381 android_manifest = blimp_test_apk_manifest
356 deps = [ 382 deps = [
357 ":blimp_test_apk_manifest", 383 ":blimp_test_apk_manifest",
358 ":blimp_test_java", 384 ":blimp_test_java",
359 google_play_services_resources, 385 google_play_services_resources,
360 ] 386 ]
361 } 387 }
362 } 388 }
OLDNEW
« no previous file with comments | « blimp/BUILD.gn ('k') | blimp/client/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698