summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authoryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-22 21:06:37 +0000
committeryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-22 21:06:37 +0000
commit4f2b94f1ce652c4f0bc919627958b8a9cf233128 (patch)
tree5ab63a7a3f017bc0ccb8f8aa1769c0f580f9ab30 /base
parent70637c944c29cc0f7f46c75e5db190da8aa9716b (diff)
downloadchromium_src-4f2b94f1ce652c4f0bc919627958b8a9cf233128.zip
chromium_src-4f2b94f1ce652c4f0bc919627958b8a9cf233128.tar.gz
chromium_src-4f2b94f1ce652c4f0bc919627958b8a9cf233128.tar.bz2
[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
Diffstat (limited to 'base')
-rw-r--r--base/android/build_info.h3
-rw-r--r--base/android/path_utils.h2
-rw-r--r--base/process_util.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/base/android/build_info.h b/base/android/build_info.h
index 6273d3e..a5f44c2 100644
--- a/base/android/build_info.h
+++ b/base/android/build_info.h
@@ -9,6 +9,7 @@
#include <string>
+#include "base/base_export.h"
#include "base/memory/singleton.h"
namespace base {
@@ -20,7 +21,7 @@ namespace android {
// It is also used to store the last java exception seen during JNI.
// TODO(nileshagrawal): Find a better place to store this info.
-class BuildInfo {
+class BASE_EXPORT BuildInfo {
public:
~BuildInfo() {}
diff --git a/base/android/path_utils.h b/base/android/path_utils.h
index 6c632f2..60f8a79 100644
--- a/base/android/path_utils.h
+++ b/base/android/path_utils.h
@@ -29,7 +29,7 @@ BASE_EXPORT bool GetCacheDirectory(FilePath* result);
// Retrieves the path to the public downloads directory. The result is placed
// in the FilePath pointed to by 'result'.
-bool GetDownloadsDirectory(FilePath* result);
+BASE_EXPORT bool GetDownloadsDirectory(FilePath* result);
// Retrieves the path to the native JNI libraries via
// ApplicationInfo.nativeLibraryDir on the Java side. The result is placed in
diff --git a/base/process_util.h b/base/process_util.h
index 10d3028..b8ad122 100644
--- a/base/process_util.h
+++ b/base/process_util.h
@@ -79,7 +79,7 @@ const uint32 kProcessAccessQueryLimitedInfomation =
const uint32 kProcessAccessWaitForTermination = SYNCHRONIZE;
#elif defined(OS_POSIX)
-struct ProcessEntry {
+struct BASE_EXPORT ProcessEntry {
ProcessEntry();
~ProcessEntry();