| OLD | NEW |
| 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 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 "values-zh/android_blimp_strings.xml", | 358 "values-zh/android_blimp_strings.xml", |
| 359 ] | 359 ] |
| 360 } | 360 } |
| 361 | 361 |
| 362 android_library("blimp_java") { | 362 android_library("blimp_java") { |
| 363 deps = [ | 363 deps = [ |
| 364 ":blimp_java_resources", | 364 ":blimp_java_resources", |
| 365 "//base:base_java", | 365 "//base:base_java", |
| 366 "//blimp/client/core:core_java", | 366 "//blimp/client/core:core_java", |
| 367 "//blimp/client/public:public_headers_java", | 367 "//blimp/client/public:public_headers_java", |
| 368 "//third_party/android_tools:android_support_annotations_java", |
| 368 | 369 |
| 369 # TODO(dtrainor): Remove the ui_java target once no more Android Toast | 370 # TODO(dtrainor): Remove the ui_java target once no more Android Toast |
| 370 # notifications are used. | 371 # notifications are used. |
| 371 "//ui/android:ui_java", | 372 "//ui/android:ui_java", |
| 372 google_play_services_library, | 373 google_play_services_library, |
| 373 ] | 374 ] |
| 374 | 375 |
| 375 java_files = [ | 376 java_files = [ |
| 376 "app/android/java/src/org/chromium/blimp/auth/RetryingTokenSource.java", | 377 "app/android/java/src/org/chromium/blimp/auth/RetryingTokenSource.java", |
| 377 "app/android/java/src/org/chromium/blimp/auth/TokenSource.java", | 378 "app/android/java/src/org/chromium/blimp/auth/TokenSource.java", |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 instrumentation_test_apk("blimp_test_apk") { | 484 instrumentation_test_apk("blimp_test_apk") { |
| 484 apk_name = "BlimpTest" | 485 apk_name = "BlimpTest" |
| 485 apk_under_test = ":blimp_apk" | 486 apk_under_test = ":blimp_apk" |
| 486 android_manifest = blimp_test_apk_manifest | 487 android_manifest = blimp_test_apk_manifest |
| 487 android_manifest_dep = ":blimp_test_apk_manifest" | 488 android_manifest_dep = ":blimp_test_apk_manifest" |
| 488 deps = [ | 489 deps = [ |
| 489 ":blimp_test_java", | 490 ":blimp_test_java", |
| 490 ] | 491 ] |
| 491 } | 492 } |
| 492 } | 493 } |
| OLD | NEW |