| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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/android/config.gni") | 5 import("//build/config/android/config.gni") |
| 6 import("//build/config/android/rules.gni") | 6 import("//build/config/android/rules.gni") |
| 7 import("//build/module_args/v8.gni") | 7 import("//build/module_args/v8.gni") |
| 8 import("//chrome/version.gni") | 8 import("//chrome/version.gni") |
| 9 import("//testing/test.gni") | 9 import("//testing/test.gni") |
| 10 import("//third_party/icu/config.gni") | 10 import("//third_party/icu/config.gni") |
| (...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 561 ":chrome_version_java", | 561 ":chrome_version_java", |
| 562 ] | 562 ] |
| 563 } | 563 } |
| 564 | 564 |
| 565 #GYP: //chrome/android/chrome_apk.gyp:custom_tabs_service_aidl | 565 #GYP: //chrome/android/chrome_apk.gyp:custom_tabs_service_aidl |
| 566 android_aidl("custom_tabs_service_aidl") { | 566 android_aidl("custom_tabs_service_aidl") { |
| 567 import_include = "java_staging/src/org/chromium/chrome/browser/customtabs" | 567 import_include = "java_staging/src/org/chromium/chrome/browser/customtabs" |
| 568 interface_file = | 568 interface_file = |
| 569 "java_staging/src/org/chromium/chrome/browser/customtabs/common.aidl" | 569 "java_staging/src/org/chromium/chrome/browser/customtabs/common.aidl" |
| 570 sources = [ | 570 sources = [ |
| 571 "java_staging/src/org/chromium/chrome/browser/customtabs/IBrowserConnectionC
allback.aidl", | 571 "java_staging/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnecti
onCallback.aidl", |
| 572 "java_staging/src/org/chromium/chrome/browser/customtabs/IBrowserConnectionS
ervice.aidl", | 572 "java_staging/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnecti
onService.aidl", |
| 573 ] | 573 ] |
| 574 } | 574 } |
| 575 | 575 |
| 576 # GYP: //chrome/android/chrome_apk.gyp:chrome_staging_java | 576 # GYP: //chrome/android/chrome_apk.gyp:chrome_staging_java |
| 577 android_library("chrome_staging_java") { | 577 android_library("chrome_staging_java") { |
| 578 DEPRECATED_java_in_dir = "java_staging/src" | 578 DEPRECATED_java_in_dir = "java_staging/src" |
| 579 | 579 |
| 580 deps = [ | 580 deps = [ |
| 581 ":chrome_staging_java_resources", | 581 ":chrome_staging_java_resources", |
| 582 "//base:base_java", | 582 "//base:base_java", |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 825 apk_name = "ChromePublicTest" | 825 apk_name = "ChromePublicTest" |
| 826 apk_under_test = ":chrome_public_apk" | 826 apk_under_test = ":chrome_public_apk" |
| 827 android_manifest = chrome_public_test_apk_manifest | 827 android_manifest = chrome_public_test_apk_manifest |
| 828 deps = [ | 828 deps = [ |
| 829 ":chrome_public_test_apk_manifest", | 829 ":chrome_public_test_apk_manifest", |
| 830 "//chrome/test/android:chrome_staging_test_support_java", | 830 "//chrome/test/android:chrome_staging_test_support_java", |
| 831 "//chrome/android:chrome_staging_test_java", | 831 "//chrome/android:chrome_staging_test_java", |
| 832 ] | 832 ] |
| 833 isolate_file = "../chrome_public_test_apk.isolate" | 833 isolate_file = "../chrome_public_test_apk.isolate" |
| 834 } | 834 } |
| OLD | NEW |