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

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

Issue 2173563003: Blimp settings UI integration for Chrome, everything still lives in Blimp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nit issues, and prepare to commit. Created 4 years, 4 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 | « no previous file | blimp/client/app/android/AndroidManifest.xml.jinja2 » ('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 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 srcjar_deps = [ "//blimp/client/core/session:java_enums_srcjar" ] 396 srcjar_deps = [ "//blimp/client/core/session:java_enums_srcjar" ]
397 } 397 }
398 398
399 android_library("blimp_test_java") { 399 android_library("blimp_test_java") {
400 testonly = true 400 testonly = true
401 401
402 deps = [ 402 deps = [
403 ":blimp_java", 403 ":blimp_java",
404 "//base:base_java", 404 "//base:base_java",
405 "//base:base_java_test_support", 405 "//base:base_java_test_support",
406 "//blimp/client/core:settings_java",
406 "//blimp/client/core/contents:contents_java", 407 "//blimp/client/core/contents:contents_java",
407 "//blimp/client/public:public_headers_java", 408 "//blimp/client/public:public_headers_java",
408 google_play_services_library, 409 google_play_services_library,
409 ] 410 ]
410 411
411 java_files = [ 412 java_files = [
412 "app/android/javatests/src/org/chromium/blimp/auth/MockTokenSource.java", 413 "app/android/javatests/src/org/chromium/blimp/auth/MockTokenSource.java",
413 "app/android/javatests/src/org/chromium/blimp/auth/RetryingTokenSourceTest .java", 414 "app/android/javatests/src/org/chromium/blimp/auth/RetryingTokenSourceTest .java",
414 "app/android/javatests/src/org/chromium/blimp/core/contents/BlimpContentsT est.java", 415 "app/android/javatests/src/org/chromium/blimp/core/contents/BlimpContentsT est.java",
416 "app/android/javatests/src/org/chromium/blimp/core/settings/BlimpPreferenc esTest.java",
417 "app/android/javatests/src/org/chromium/blimp/core/settings/MockPreference s.java",
415 "app/android/javatests/src/org/chromium/blimp/BlimpNativeInstrumentationTe stCase.java", 418 "app/android/javatests/src/org/chromium/blimp/BlimpNativeInstrumentationTe stCase.java",
416 ] 419 ]
417 } 420 }
418 421
419 shared_library("blimp_client_android") { 422 shared_library("blimp_client_android") {
420 deps = [ 423 deps = [
421 ":client", 424 ":client",
422 ":jni_headers", 425 ":jni_headers",
423 "//base", 426 "//base",
424 "//blimp/client:compositor", 427 "//blimp/client:compositor",
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 instrumentation_test_apk("blimp_test_apk") { 483 instrumentation_test_apk("blimp_test_apk") {
481 apk_name = "BlimpTest" 484 apk_name = "BlimpTest"
482 apk_under_test = ":blimp_apk" 485 apk_under_test = ":blimp_apk"
483 android_manifest = blimp_test_apk_manifest 486 android_manifest = blimp_test_apk_manifest
484 android_manifest_dep = ":blimp_test_apk_manifest" 487 android_manifest_dep = ":blimp_test_apk_manifest"
485 deps = [ 488 deps = [
486 ":blimp_test_java", 489 ":blimp_test_java",
487 ] 490 ]
488 } 491 }
489 } 492 }
OLDNEW
« no previous file with comments | « no previous file | blimp/client/app/android/AndroidManifest.xml.jinja2 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698