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 | 7 |
8 android_library("net_java") { | 8 android_library("net_java") { |
9 DEPRECATED_java_in_dir = "java/src" | 9 DEPRECATED_java_in_dir = "java/src" |
10 deps = [ | 10 deps = [ |
11 "//base:base_java", | 11 "//base:base_java", |
12 ] | 12 ] |
13 srcjar_deps = [ | 13 srcjar_deps = [ |
14 ":net_errors_java", | 14 ":net_errors_java", |
15 ":net_android_java_enums_srcjar", | 15 ":net_android_java_enums_srcjar", |
16 ":remote_android_keystore_aidl", | 16 ":remote_android_keystore_aidl", |
17 ] | 17 ] |
18 } | 18 } |
19 | 19 |
20 android_aidl("remote_android_keystore_aidl") { | 20 android_aidl("remote_android_keystore_aidl") { |
21 interface_file = | 21 interface_file = |
22 "java/src/org/chromium/net/IRemoteAndroidKeyStoreInterface.aidl" | 22 "java/src/org/chromium/net/IRemoteAndroidKeyStoreInterface.aidl" |
23 sources = [ | 23 sources = [ |
24 "java/src/org/chromium/net/IRemoteAndroidKeyStore.aidl", | 24 "java/src/org/chromium/net/IRemoteAndroidKeyStore.aidl", |
25 "java/src/org/chromium/net/IRemoteAndroidKeyStoreCallbacks.aidl", | 25 "java/src/org/chromium/net/IRemoteAndroidKeyStoreCallbacks.aidl", |
26 ] | 26 ] |
27 } | 27 } |
28 | 28 |
29 android_library("net_java_test_support") { | 29 # TODO(vtl): Doesn't build with SDK version 23; needs some fixin'. |
30 DEPRECATED_java_in_dir = "../test/android/javatests/src" | 30 #android_library("net_java_test_support") { |
31 deps = [ | 31 # DEPRECATED_java_in_dir = "../test/android/javatests/src" |
32 "//base:base_java", | 32 # deps = [ |
33 ] | 33 # "//base:base_java", |
34 srcjar_deps = [ ":net_java_test_support_enums_srcjar" ] | 34 # ] |
35 } | 35 # srcjar_deps = [ ":net_java_test_support_enums_srcjar" ] |
36 | 36 #} |
37 android_library("net_javatests") { | 37 # |
38 DEPRECATED_java_in_dir = "javatests/src" | 38 #android_library("net_javatests") { |
39 deps = [ | 39 # DEPRECATED_java_in_dir = "javatests/src" |
40 "//base:base_java", | 40 # deps = [ |
41 "//base:base_java_test_support", | 41 # "//base:base_java", |
42 ":net_java", | 42 # "//base:base_java_test_support", |
43 ] | 43 # ":net_java", |
44 } | 44 # ] |
| 45 #} |
45 | 46 |
46 java_cpp_template("net_errors_java") { | 47 java_cpp_template("net_errors_java") { |
47 package_name = "org/chromium/net" | 48 package_name = "org/chromium/net" |
48 sources = [ | 49 sources = [ |
49 "java/NetError.template", | 50 "java/NetError.template", |
50 ] | 51 ] |
51 inputs = [ | 52 inputs = [ |
52 "../base/net_error_list.h", | 53 "../base/net_error_list.h", |
53 ] | 54 ] |
54 } | 55 } |
(...skipping 27 matching lines...) Expand all Loading... |
82 if (false) { | 83 if (false) { |
83 unittest_apk("net_unittests_apk") { | 84 unittest_apk("net_unittests_apk") { |
84 deps = [ | 85 deps = [ |
85 ":net_java", | 86 ":net_java", |
86 ":net_javatests", | 87 ":net_javatests", |
87 "//net:net_unittests", | 88 "//net:net_unittests", |
88 ] | 89 ] |
89 unittests_dep = "//net:net_unittests" | 90 unittests_dep = "//net:net_unittests" |
90 } | 91 } |
91 } | 92 } |
OLD | NEW |