diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-22 21:06:37 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-22 21:06:37 +0000 |
| commit | 4f2b94f1ce652c4f0bc919627958b8a9cf233128 (patch) | |
| tree | 5ab63a7a3f017bc0ccb8f8aa1769c0f580f9ab30 /chrome/chrome_android.gypi | |
| parent | 70637c944c29cc0f7f46c75e5db190da8aa9716b (diff) | |
| download | chromium_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 'chrome/chrome_android.gypi')
| -rw-r--r-- | chrome/chrome_android.gypi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi index 70b7ba6..245b321 100644 --- a/chrome/chrome_android.gypi +++ b/chrome/chrome_android.gypi @@ -14,7 +14,10 @@ 'target_name': 'libchromiumtestshell', 'type': 'shared_library', 'dependencies': [ + '../base/base.gyp:base', + '../jingle/jingle.gyp:notifier', 'chrome_android_core', + 'chrome.gyp:browser_ui', ], 'sources': [ # This file must always be included in the shared_library step to ensure @@ -98,6 +101,7 @@ 'type': 'static_library', 'dependencies': [ 'chrome.gyp:browser', + 'chrome.gyp:browser_ui', 'chrome.gyp:plugin', 'chrome.gyp:renderer', 'chrome.gyp:utility', |