| 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 | 13 | 
| 14   srcjar_deps = [ | 14   srcjar_deps = [ | 
| 15     ":net_errors_java", | 15     ":net_errors_java", | 
| 16     ":net_android_java_enums_srcjar", | 16     ":net_android_java_enums_srcjar", | 
| 17     ":remote_android_keystore_aidl", | 17     ":remote_android_keystore_aidl", | 
| 18   ] | 18   ] | 
| 19 } | 19 } | 
| 20 | 20 | 
| 21 android_aidl("remote_android_keystore_aidl") { | 21 android_aidl("remote_android_keystore_aidl") { | 
| 22   interface_file = "java/src/org/chromium/net/IRemoteAndroidKeyStoreInterface.ai
    dl" | 22   interface_file = | 
|  | 23       "java/src/org/chromium/net/IRemoteAndroidKeyStoreInterface.aidl" | 
| 23   sources = [ | 24   sources = [ | 
| 24     "java/src/org/chromium/net/IRemoteAndroidKeyStore.aidl", | 25     "java/src/org/chromium/net/IRemoteAndroidKeyStore.aidl", | 
| 25     "java/src/org/chromium/net/IRemoteAndroidKeyStoreCallbacks.aidl", | 26     "java/src/org/chromium/net/IRemoteAndroidKeyStoreCallbacks.aidl", | 
| 26   ] | 27   ] | 
| 27 } | 28 } | 
| 28 | 29 | 
| 29 android_library("net_java_test_support") { | 30 android_library("net_java_test_support") { | 
| 30   DEPRECATED_java_in_dir = "../test/android/javatests/src" | 31   DEPRECATED_java_in_dir = "../test/android/javatests/src" | 
| 31 } | 32 } | 
| 32 | 33 | 
| 33 android_library("net_javatests") { | 34 android_library("net_javatests") { | 
| 34   DEPRECATED_java_in_dir = "javatests/src" | 35   DEPRECATED_java_in_dir = "javatests/src" | 
| 35   deps = [ | 36   deps = [ | 
| 36     "//base:base_java", | 37     "//base:base_java", | 
| 37     "//base:base_java_test_support", | 38     "//base:base_java_test_support", | 
| 38     ":net_java", | 39     ":net_java", | 
| 39   ] | 40   ] | 
| 40 } | 41 } | 
| 41 | 42 | 
| 42 java_cpp_template("net_errors_java") { | 43 java_cpp_template("net_errors_java") { | 
| 43   package_name = "org/chromium/net" | 44   package_name = "org/chromium/net" | 
| 44   sources = [ | 45   sources = [ | 
| 45     "java/NetError.template", | 46     "java/NetError.template", | 
| 46   ] | 47   ] | 
| 47   inputs = [ | 48   inputs = [ | 
| 48     "../base/net_error_list.h" | 49     "../base/net_error_list.h", | 
| 49   ] | 50   ] | 
| 50 } | 51 } | 
| 51 | 52 | 
| 52 java_cpp_enum("net_android_java_enums_srcjar") { | 53 java_cpp_enum("net_android_java_enums_srcjar") { | 
| 53   sources = [ | 54   sources = [ | 
| 54     "../base/mime_util.h", | 55     "../base/mime_util.h", | 
| 55     "../base/network_change_notifier.h", | 56     "../base/network_change_notifier.h", | 
| 56     "cert_verify_result_android.h", | 57     "cert_verify_result_android.h", | 
| 57     "keystore.h" | 58     "keystore.h", | 
| 58   ] | 59   ] | 
| 59   outputs = [ | 60   outputs = [ | 
| 60     "org/chromium/net/CertificateMimeType.java", | 61     "org/chromium/net/CertificateMimeType.java", | 
| 61     "org/chromium/net/CertVerifyStatusAndroid.java", | 62     "org/chromium/net/CertVerifyStatusAndroid.java", | 
| 62     "org/chromium/net/ConnectionSubtype.java", | 63     "org/chromium/net/ConnectionSubtype.java", | 
| 63     "org/chromium/net/ConnectionType.java", | 64     "org/chromium/net/ConnectionType.java", | 
| 64     "org/chromium/net/PrivateKeyType.java", | 65     "org/chromium/net/PrivateKeyType.java", | 
| 65   ] | 66   ] | 
| 66 } | 67 } | 
| 67 | 68 | 
| 68 # TODO(GYP) | 69 # TODO(GYP) | 
| 69 if (false) { | 70 if (false) { | 
| 70   unittest_apk("net_unittests_apk") { | 71   unittest_apk("net_unittests_apk") { | 
| 71     deps = [ | 72     deps = [ | 
| 72       ":net_java", | 73       ":net_java", | 
| 73       ":net_javatests", | 74       ":net_javatests", | 
| 74       "//net:net_unittests", | 75       "//net:net_unittests", | 
| 75     ] | 76     ] | 
| 76     unittests_dep = "//net:net_unittests" | 77     unittests_dep = "//net:net_unittests" | 
| 77   } | 78   } | 
| 78 } | 79 } | 
| OLD | NEW | 
|---|