diff options
| author | nyquist@google.com <nyquist@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 21:52:44 +0000 |
|---|---|---|
| committer | nyquist@google.com <nyquist@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 21:52:44 +0000 |
| commit | 982cedd4272743bce74fd3a7ea58c82924a8b7cb (patch) | |
| tree | a0cb4d895e3185b87f9aab410de70b022eed3130 | |
| parent | c9c33c66c4c17ec027f86d895d7528a478fd82d6 (diff) | |
| download | chromium_src-982cedd4272743bce74fd3a7ea58c82924a8b7cb.zip chromium_src-982cedd4272743bce74fd3a7ea58c82924a8b7cb.tar.gz chromium_src-982cedd4272743bce74fd3a7ea58c82924a8b7cb.tar.bz2 | |
[net] Move android/x509_util.[cc|h] to cert/x509_util_android.[cc|h]
Another x509_util.[cc|h] already exist, and the Android specific files
where introduced in r230126.
BUG=149426
R=rsleevi@chromium.org
Review URL: https://codereview.chromium.org/35763004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230218 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/android/net_jni_registrar.cc | 2 | ||||
| -rw-r--r-- | net/cert/x509_util_android.cc (renamed from net/android/x509_util.cc) | 2 | ||||
| -rw-r--r-- | net/cert/x509_util_android.h (renamed from net/android/x509_util.h) | 6 | ||||
| -rw-r--r-- | net/net.gyp | 6 | ||||
| -rw-r--r-- | tools/gn/secondary/net/BUILD.gn | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/net/android/net_jni_registrar.cc b/net/android/net_jni_registrar.cc index ab99725..f7712bb 100644 --- a/net/android/net_jni_registrar.cc +++ b/net/android/net_jni_registrar.cc @@ -11,7 +11,7 @@ #include "net/android/keystore.h" #include "net/android/network_change_notifier_android.h" #include "net/android/network_library.h" -#include "net/android/x509_util.h" +#include "net/cert/x509_util_android.h" #include "net/proxy/proxy_config_service_android.h" namespace net { diff --git a/net/android/x509_util.cc b/net/cert/x509_util_android.cc index 9f3491f..1f6c3c6 100644 --- a/net/android/x509_util.cc +++ b/net/cert/x509_util_android.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/android/x509_util.h" +#include "net/cert/x509_util_android.h" #include "base/android/jni_android.h" #include "jni/X509Util_jni.h" diff --git a/net/android/x509_util.h b/net/cert/x509_util_android.h index 963dd23..205a60a 100644 --- a/net/android/x509_util.h +++ b/net/cert/x509_util_android.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_ANDROID_X509_UTIL_H_ -#define NET_ANDROID_X509_UTIL_H_ +#ifndef NET_CERT_X509_UTIL_ANDROID_H_ +#define NET_CERT_X509_UTIL_ANDROID_H_ #include <jni.h> @@ -13,4 +13,4 @@ bool RegisterX509Util(JNIEnv* env); } // net namespace -#endif // NET_ANDROID_X509_UTIL_H_ +#endif // NET_CERT_X509_UTIL_ANDROID_H_ diff --git a/net/net.gyp b/net/net.gyp index 3481f45..b98be2b 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -78,8 +78,6 @@ 'android/network_change_notifier_factory_android.h', 'android/network_library.cc', 'android/network_library.h', - 'android/x509_util.cc', - 'android/x509_util.h', 'base/address_family.h', 'base/address_list.cc', 'base/address_list.h', @@ -305,8 +303,10 @@ 'cert/x509_certificate_nss.cc', 'cert/x509_certificate_openssl.cc', 'cert/x509_certificate_win.cc', - 'cert/x509_util.h', 'cert/x509_util.cc', + 'cert/x509_util.h', + 'cert/x509_util_android.cc', + 'cert/x509_util_android.h', 'cert/x509_util_ios.cc', 'cert/x509_util_ios.h', 'cert/x509_util_mac.cc', diff --git a/tools/gn/secondary/net/BUILD.gn b/tools/gn/secondary/net/BUILD.gn index 77ac418..114da13 100644 --- a/tools/gn/secondary/net/BUILD.gn +++ b/tools/gn/secondary/net/BUILD.gn @@ -26,8 +26,6 @@ component("net") { "android/network_change_notifier_factory_android.h", "android/network_library.cc", "android/network_library.h", - "android/x509_util.cc", - "android/x509_util.h", "base/address_family.h", "base/address_list.cc", "base/address_list.h", @@ -254,6 +252,8 @@ component("net") { "cert/x509_certificate_win.cc", "cert/x509_util.h", "cert/x509_util.cc", + "cert/x509_util_android.cc", + "cert/x509_util_android.h", "cert/x509_util_ios.cc", "cert/x509_util_ios.h", "cert/x509_util_mac.cc", |