diff options
author | Kristian Monsen <kristianm@google.com> | 2011-10-24 03:05:06 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-24 03:05:06 -0700 |
commit | 7c64b48173bdf97d0ce1da5be37dc682185c5671 (patch) | |
tree | 7536e811f0518ca0e29ae7482e8fe0c12860b65d | |
parent | 008a72709c6a2c8e00996025f72e49776b27f414 (diff) | |
parent | a3fef89eb00853adb6524ab3d11c60f754f08b09 (diff) | |
download | external_chromium-7c64b48173bdf97d0ce1da5be37dc682185c5671.zip external_chromium-7c64b48173bdf97d0ce1da5be37dc682185c5671.tar.gz external_chromium-7c64b48173bdf97d0ce1da5be37dc682185c5671.tar.bz2 |
am a3fef89e: Part of fix for bug 5455901 Export symbols in android/
* commit 'a3fef89eb00853adb6524ab3d11c60f754f08b09':
Part of fix for bug 5455901 Export symbols in android/
-rw-r--r-- | android/autofill/android_url_request_context_getter.h | 3 | ||||
-rw-r--r-- | android/jni/jni_utils.h | 3 | ||||
-rw-r--r-- | android/net/android_network_library_impl.h | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/android/autofill/android_url_request_context_getter.h b/android/autofill/android_url_request_context_getter.h index 4c34081..3ee4804 100644 --- a/android/autofill/android_url_request_context_getter.h +++ b/android/autofill/android_url_request_context_getter.h @@ -28,10 +28,11 @@ #include "base/message_loop_proxy.h" #include "base/threading/thread.h" +#include "net/base/net_export.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_context.h" -class AndroidURLRequestContextGetter : public net::URLRequestContextGetter { +class NET_EXPORT AndroidURLRequestContextGetter : public net::URLRequestContextGetter { public: AndroidURLRequestContextGetter(net::URLRequestContext* context, base::Thread* ioThread) : context_(context) diff --git a/android/jni/jni_utils.h b/android/jni/jni_utils.h index b4141f8..96734a7 100644 --- a/android/jni/jni_utils.h +++ b/android/jni/jni_utils.h @@ -5,6 +5,7 @@ #include <string> +#include "base/base_api.h" #include "base/string16.h" #include "nativehelper/jni.h" @@ -12,7 +13,7 @@ namespace android { namespace jni { // To avoid name conflict with similar functions in webkit -void SetJavaVM(JavaVM* vm); +void BASE_API SetJavaVM(JavaVM* vm); // Get the JNI environment for the current thread. JNIEnv* GetJNIEnv(); diff --git a/android/net/android_network_library_impl.h b/android/net/android_network_library_impl.h index 8f2e9f7..1d5019a 100644 --- a/android/net/android_network_library_impl.h +++ b/android/net/android_network_library_impl.h @@ -13,8 +13,9 @@ #include <vector> #include "net/base/android_network_library.h" +#include "net/base/net_export.h" -class AndroidNetworkLibraryImpl : public net::AndroidNetworkLibrary { +class NET_EXPORT AndroidNetworkLibraryImpl : public net::AndroidNetworkLibrary { public: static void InitWithApplicationContext(JNIEnv* env, jobject context); |