[Android] Fix remaining linker errors for components build

Miscellaneous missing dependencies and a few more exports.

BUG=158821


Review URL: https://chromiumcodereview.appspot.com/12988003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191944 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 34 insertions, 22 deletions

diff --git a/android_webview/browser/net/aw_url_request_job_factory.cc b/android_webview/browser/net/aw_url_request_job_factory.cc
index c14cd17..3777a81 100644
--- a/android_webview/browser/net/aw_url_request_job_factory.cc
+++ b/android_webview/browser/net/aw_url_request_job_factory.cc
@@ -47,10 +47,10 @@ URLRequestJob* AwURLRequestJobFactory::MaybeCreateJobWithProtocolHandler(
   if (job)
     return job;
 
-  // If the URLRequestJobManager supports the scheme NULL should be returned
-  // from this method. In that case the built in handlers in
-  // URLRequestJobManager will then be used to create the job.
-  if (net::URLRequestJobManager::GetInstance()->SupportsScheme(scheme))
+  // If URLRequest supports the scheme NULL should be returned from this method.
+  // In that case the built in handlers will then be used to create the job.
+  // NOTE(joth): See the assumption in IsHandledProtocol above.
+  if (net::URLRequest::IsHandledProtocol(scheme))
     return NULL;
 
   return new net::URLRequestErrorJob(
diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp
index 28ef1d8..d175d3c 100644
--- a/android_webview/native/webview_native.gyp
+++ b/android_webview/native/webview_native.gyp
@@ -11,8 +11,13 @@
       'type': 'static_library',
       'dependencies': [
         '../../base/base.gyp:base_static',
+        '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../../components/components.gyp:web_contents_delegate_android',
+        '../../cc/cc.gyp:cc',
+        '../../net/net.gyp:net',
         '../../skia/skia.gyp:skia',
+        '../../webkit/support/webkit_support.gyp:user_agent',
+        '../../webkit/support/webkit_support.gyp:webkit_storage',
         'android_webview_native_jni',
       ],
       'include_dirs': [
diff --git a/content/common/content_constants_internal.h b/content/common/content_constants_internal.h
index 7ee5b0d..c4b54de 100644
--- a/content/common/content_constants_internal.h
+++ b/content/common/content_constants_internal.h
@@ -5,16 +5,18 @@
 #ifndef CONTENT_COMMON_CONTENT_CONSTANTS_INTERNAL_H_
 #define CONTENT_COMMON_CONTENT_CONSTANTS_INTERNAL_H_
 
+#include "content/common/content_export.h"
+
 namespace content {
 
 // Keys used for serializing the frame tree of a renderer process, used for
 // ViewMsg_UpdateFrameTree and ViewHostMsg_FrameTreeUpdated.
-extern const char kFrameTreeNodeNameKey[];
-extern const char kFrameTreeNodeIdKey[];
-extern const char kFrameTreeNodeSubtreeKey[];
+CONTENT_EXPORT extern const char kFrameTreeNodeNameKey[];
+CONTENT_EXPORT extern const char kFrameTreeNodeIdKey[];
+CONTENT_EXPORT extern const char kFrameTreeNodeSubtreeKey[];
 
 // How long to wait before we consider a renderer hung.
-extern const int kHungRendererDelayMs;
+CONTENT_EXPORT extern const int kHungRendererDelayMs;
 
 } // namespace content
 
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index a8542bf..e3c4606 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -640,6 +640,9 @@
           ],
         }],
         ['OS == "android"', {
+          'dependencies': [
+            '../ui/ui.gyp:shell_dialogs',
+          ],
           'sources!': [
             'browser/geolocation/device_data_provider_unittest.cc',
             'browser/geolocation/gps_location_provider_unittest_linux.cc',
@@ -760,8 +763,6 @@
             'browser/web_contents/web_contents_view_aura_browsertest.cc',
             'browser/webkit_browsertest.cc',
             'browser/worker_host/test/worker_browsertest.cc',
-            'common/content_constants_internal.cc',
-            'common/content_constants_internal.h',
             'renderer/accessibility/renderer_accessibility_browsertest.cc',
             'renderer/browser_plugin/mock_browser_plugin.h',
             'renderer/browser_plugin/mock_browser_plugin.cc',
@@ -851,11 +852,6 @@
             ['OS=="android"', {
               'sources!': [
                 'browser/accessibility/dump_accessibility_tree_browsertest.cc',
-                # These are included via dependency on content_common and hence
-                # we get multiple definition errors in a shared library build.
-                # Other builds need it as the symbols are not exported.
-                'common/content_constants_internal.cc',
-                'common/content_constants_internal.h',
               ],
               'sources': [
                 'shell/android/browsertests_apk/content_browser_tests_android.cc',
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index f070dea..eb0a94c 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -220,7 +220,7 @@ CONTENT_EXPORT extern const char kUseMobileUserAgent[];
 extern const char kDisableMediaHistoryLogging[];
 extern const char kDisableGestureRequirementForMediaPlayback[];
 extern const char kNetworkCountryIso[];
-extern const char kEnableWebViewSynchronousAPIs[];
+CONTENT_EXPORT extern const char kEnableWebViewSynchronousAPIs[];
 #endif
 
 #if defined(OS_CHROMEOS)
diff --git a/gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.h b/gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.h
index 67d726e..2d607bf 100644
--- a/gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.h
+++ b/gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.h
@@ -6,6 +6,7 @@
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_COPY_TEXTURE_CHROMIUM_H_
 
 #include "gpu/command_buffer/service/gl_utils.h"
+#include "gpu/gpu_export.h"
 
 namespace gpu {
 namespace gles2 {
@@ -17,7 +18,7 @@ class GLES2Decoder;
 // This class encapsulates the resources required to implement the
 // GL_CHROMIUM_copy_texture extension.  The copy operation is performed
 // via a blit to a framebuffer object.
-class CopyTextureCHROMIUMResourceManager {
+class GPU_EXPORT CopyTextureCHROMIUMResourceManager {
  public:
   CopyTextureCHROMIUMResourceManager() : initialized_(false) {}
 
diff --git a/net/android/keystore.h b/net/android/keystore.h
index 32f0723..9ede4bf 100644
--- a/net/android/keystore.h
+++ b/net/android/keystore.h
@@ -81,7 +81,7 @@ bool GetPrivateKeyEncodedBytes(jobject private_key,
 // |signature| will receive the signature on success.
 // Returns true on success, false on failure.
 //
-bool RawSignDigestWithPrivateKey(
+NET_EXPORT bool RawSignDigestWithPrivateKey(
     jobject private_key,
     const base::StringPiece& digest,
     std::vector<uint8>* signature);
diff --git a/net/ssl/openssl_client_key_store.h b/net/ssl/openssl_client_key_store.h
index b3980eb..6d90253 100644
--- a/net/ssl/openssl_client_key_store.h
+++ b/net/ssl/openssl_client_key_store.h
@@ -26,7 +26,7 @@ class X509Certificate;
 //
 // This class is not thread-safe and should only be used from the network
 // thread.
-class OpenSSLClientKeyStore {
+class NET_EXPORT OpenSSLClientKeyStore {
  public:
   // Platforms must define this factory function as appropriate.
   static OpenSSLClientKeyStore* GetInstance();
diff --git a/sync/internal_api/public/base/model_type.h b/sync/internal_api/public/base/model_type.h
index 7a95d8c..197e695 100644
--- a/sync/internal_api/public/base/model_type.h
+++ b/sync/internal_api/public/base/model_type.h
@@ -276,8 +276,9 @@ bool RealModelTypeToNotificationType(ModelType model_type,
 // Converts a notification type to a real model type.  Returns true
 // iff |notification_type| was the notification type of a real model
 // type and |model_type| was filled in.
-bool NotificationTypeToRealModelType(const std::string& notification_type,
-                                     ModelType* model_type);
+SYNC_EXPORT bool NotificationTypeToRealModelType(
+    const std::string& notification_type,
+    ModelType* model_type);
 
 // Returns true if |model_type| is a real datatype
 SYNC_EXPORT bool IsRealDataType(ModelType model_type);
diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp
index 9e50c39..bbed98a 100644
--- a/testing/android/native_test.gyp
+++ b/testing/android/native_test.gyp
@@ -67,6 +67,7 @@
           'dependencies': [
             '../../base/base.gyp:base',
             '../../base/base.gyp:test_support_base',
+            '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../gtest.gyp:gtest',
             'native_test_jni_headers',
             'native_test_util',
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index 53b3136..ea9f280 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -259,6 +259,11 @@
             'android_native_window.cc',
             'android_native_window.h',
           ],
+          'link_settings': {
+            'libraries': [
+              '-landroid',
+            ],
+          },
           'sources!': [
             'gl_context_osmesa.cc',
             'system_monitor_posix.cc',
diff --git a/webkit/glue/fling_animator_impl_android.h b/webkit/glue/fling_animator_impl_android.h
index 0068c73..e3d6bf8 100644
--- a/webkit/glue/fling_animator_impl_android.h
+++ b/webkit/glue/fling_animator_impl_android.h
@@ -11,6 +11,7 @@
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/point_f.h"
+#include "webkit/glue/webkit_glue_export.h"
 
 namespace WebKit {
 class WebGestureCurveTarget;
@@ -18,7 +19,7 @@ class WebGestureCurveTarget;
 
 namespace webkit_glue {
 
-class FlingAnimatorImpl : public WebKit::WebGestureCurve {
+class WEBKIT_GLUE_EXPORT FlingAnimatorImpl : public WebKit::WebGestureCurve {
  public:
   FlingAnimatorImpl();
   virtual ~FlingAnimatorImpl();