summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 17:38:47 +0000
committeryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 17:38:47 +0000
commitbe363b2ae7d3ebc594d6db53313985b07977d80b (patch)
tree72fda6b181f221cbaa6e438e0fb696bbf47d518b /net
parent42af17eaa9447b313098eca6fd5d018934cd0bbd (diff)
downloadchromium_src-be363b2ae7d3ebc594d6db53313985b07977d80b.zip
chromium_src-be363b2ae7d3ebc594d6db53313985b07977d80b.tar.gz
chromium_src-be363b2ae7d3ebc594d6db53313985b07977d80b.tar.bz2
First step towards component build for Android.
Add symbol exports needed to build content shell. BUG=158821 Review URL: https://codereview.chromium.org/11368031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/android/net_jni_registrar.h4
-rw-r--r--net/android/network_change_notifier_android.h2
-rw-r--r--net/android/network_change_notifier_factory_android.h3
-rw-r--r--net/android/network_library.h3
-rw-r--r--net/base/network_delegate.h2
5 files changed, 9 insertions, 5 deletions
diff --git a/net/android/net_jni_registrar.h b/net/android/net_jni_registrar.h
index 8fd0965..2b45fb2 100644
--- a/net/android/net_jni_registrar.h
+++ b/net/android/net_jni_registrar.h
@@ -7,11 +7,13 @@
#include <jni.h>
+#include "net/base/net_export.h"
+
namespace net {
namespace android {
// Register all JNI bindings necessary for net.
-bool RegisterJni(JNIEnv* env);
+NET_EXPORT bool RegisterJni(JNIEnv* env);
} // namespace android
} // namespace net
diff --git a/net/android/network_change_notifier_android.h b/net/android/network_change_notifier_android.h
index f5311ac..e4d8469 100644
--- a/net/android/network_change_notifier_android.h
+++ b/net/android/network_change_notifier_android.h
@@ -15,7 +15,7 @@ namespace net {
class NetworkChangeNotifierAndroidTest;
-class NetworkChangeNotifierAndroid : public NetworkChangeNotifier {
+class NET_EXPORT NetworkChangeNotifierAndroid : public NetworkChangeNotifier {
public:
virtual ~NetworkChangeNotifierAndroid();
diff --git a/net/android/network_change_notifier_factory_android.h b/net/android/network_change_notifier_factory_android.h
index d4bd99f..8c5e414 100644
--- a/net/android/network_change_notifier_factory_android.h
+++ b/net/android/network_change_notifier_factory_android.h
@@ -6,6 +6,7 @@
#define NET_ANDROID_NETWORK_CHANGE_NOTIFIER_FACTORY_ANDROID_H_
#include "base/compiler_specific.h"
+#include "net/base/net_export.h"
#include "net/base/network_change_notifier_factory.h"
namespace net {
@@ -14,7 +15,7 @@ class NetworkChangeNotifier;
// NetworkChangeNotifierFactory creates Android-specific specialization of
// NetworkChangeNotifier.
-class NetworkChangeNotifierFactoryAndroid :
+class NET_EXPORT NetworkChangeNotifierFactoryAndroid :
public NetworkChangeNotifierFactory {
public:
NetworkChangeNotifierFactoryAndroid();
diff --git a/net/android/network_library.h b/net/android/network_library.h
index 7836b55..c505202 100644
--- a/net/android/network_library.h
+++ b/net/android/network_library.h
@@ -11,6 +11,7 @@
#include <vector>
#include "base/basictypes.h"
+#include "net/base/net_export.h"
namespace net {
namespace android {
@@ -63,7 +64,7 @@ bool GetMimeTypeFromExtension(const std::string& extension,
std::string* result);
// Register JNI methods
-bool RegisterNetworkLibrary(JNIEnv* env);
+NET_EXPORT bool RegisterNetworkLibrary(JNIEnv* env);
} // namespace android
} // namespace net
diff --git a/net/base/network_delegate.h b/net/base/network_delegate.h
index 907d0b9b..5475754 100644
--- a/net/base/network_delegate.h
+++ b/net/base/network_delegate.h
@@ -35,7 +35,7 @@ class HttpResponseHeaders;
class SocketStream;
class URLRequest;
-class NetworkDelegate : public base::NonThreadSafe {
+class NET_EXPORT NetworkDelegate : public base::NonThreadSafe {
public:
// AuthRequiredResponse indicates how a NetworkDelegate handles an
// OnAuthRequired call. It's placed in this file to prevent url_request.h