[Android] Make content_shell_apk and chromium_testshell components friendly.

This includes the remaining changes to atleast _compile_ the above
targets. More work is needed for starting up the apps and running.

Inclues:
- Misc EXPORT additions (I assume I can TBR these)
- Introduce a ShellDialogs JNI registrar since it's now a separate
  component and ui can't depend on it.
- Random gyp tweaks that are needed to fully specify dependencies
- Change from using NPN_MemAlloc to just plain malloc for the java
  bridge. For some reason the NPN_MemAlloc symbol cannot be found in the
  component build, but regardless all our implementations end up calling
  straight throught to malloc.

BUG=158821
TBR=wjia@chromium.org,willchan@chromium.org,jcivelli@chromium.org

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

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

2 files changed, 8 insertions, 8 deletions

diff --git a/net/android/keystore.h b/net/android/keystore.h
index 58a994b..6267719 100644
--- a/net/android/keystore.h
+++ b/net/android/keystore.h
@@ -40,8 +40,8 @@ enum PrivateKeyType {
 // |modulus| will receive the modulus bytes on success.
 // Returns true on success, or false on failure (e.g. if the key
 // is not RSA).
-bool GetRSAKeyModulus(jobject private_key,
-                      std::vector<uint8>* modulus);
+NET_EXPORT bool GetRSAKeyModulus(jobject private_key,
+                                 std::vector<uint8>* modulus);
 
 // Returns the Q parameter of a given DSAPrivateKey platform object,
 // as a series of bytes, in big-endian representation. This can be used
@@ -50,8 +50,8 @@ bool GetRSAKeyModulus(jobject private_key,
 // |q| will receive the result bytes on success.
 // Returns true on success, or false on failure (e.g. if the key is
 // not DSA).
-bool GetDSAKeyParamQ(jobject private_key,
-                     std::vector<uint8>* q);
+NET_EXPORT bool GetDSAKeyParamQ(jobject private_key,
+                                std::vector<uint8>* q);
 
 // Returns the order parameter of a given ECPrivateKey platform object,
 // as a series of bytes, in big-endian representation. This can be used
@@ -91,7 +91,7 @@ bool RawSignDigestWithPrivateKey(
 // |private_key| is a JNI reference for the private key.
 // Returns a PrivateKeyType, while will be CLIENT_CERT_INVALID_TYPE
 // on error.
-PrivateKeyType GetPrivateKeyType(jobject private_key);
+NET_EXPORT PrivateKeyType GetPrivateKeyType(jobject private_key);
 
 // Returns a handle to the system EVP_PKEY object used to back a given
 // private_key object. This must *only* be used for RSA private keys
diff --git a/net/android/network_library.h b/net/android/network_library.h
index 451834e..6bdc1ae 100644
--- a/net/android/network_library.h
+++ b/net/android/network_library.h
@@ -48,9 +48,9 @@ bool StoreKeyPair(const uint8* public_key,
 
 // Helper used to pass the DER-encoded bytes of an X.509 certificate or
 // a PKCS#12 archive holding a private key to the CertInstaller activity.
-void StoreCertificate(net::CertificateMimeType cert_type,
-                      const void* data,
-                      size_t data_len);
+NET_EXPORT void StoreCertificate(net::CertificateMimeType cert_type,
+                                 const void* data,
+                                 size_t data_len);
 
 // Returns true if it can determine that only loopback addresses are configured.
 // i.e. if only 127.0.0.1 and ::1 are routable.