diff options
| author | michaelbai <michaelbai@chromium.org> | 2015-03-04 14:44:31 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-04 22:45:21 +0000 |
| commit | 34a24da6b5dee735edecd2260253660fa9d56e97 (patch) | |
| tree | fbaf54a5a1291c8ba2d9683b194671a136c7faf7 /chrome | |
| parent | a7ee74f6c4c305ec4d964af49d95af90eaab3cd3 (diff) | |
| download | chromium_src-34a24da6b5dee735edecd2260253660fa9d56e97.zip chromium_src-34a24da6b5dee735edecd2260253660fa9d56e97.tar.gz chromium_src-34a24da6b5dee735edecd2260253660fa9d56e97.tar.bz2 | |
Change chrome android to use content_app_both
content_app_browser and content_app_child are designed to be used for Windows DLL, for android we build browser and child process in same shared library, content_app_both should be used in Android.
BUG=464008
TBR=jochen
Review URL: https://codereview.chromium.org/970413002
Cr-Commit-Position: refs/heads/master@{#319147}
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/BUILD.gn | 2 | ||||
| -rw-r--r-- | chrome/android/BUILD.gn | 2 | ||||
| -rw-r--r-- | chrome/chrome_android.gypi | 2 | ||||
| -rw-r--r-- | chrome/chrome_shell.gypi | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn index ddd8572..343cedb 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -693,7 +693,7 @@ if (is_android) { "//chrome/renderer", "//chrome/utility", "//components/enhanced_bookmarks", - "//content/public/app:browser", + "//content/public/app:both", ] } } diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index 4619c5b..59a6c5b 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -164,7 +164,7 @@ group("chrome_shell_base") { "//chrome:chrome_android_core", "//base", "//base/allocator", - "//content/public/app:browser", + "//content/public/app:both", "//skia", ] # TODO(GYP): diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi index 46fb504..734cda9 100644 --- a/chrome/chrome_android.gypi +++ b/chrome/chrome_android.gypi @@ -32,7 +32,7 @@ # is upstreamed. '../components/components.gyp:enhanced_bookmarks', '../content/content.gyp:content', - '../content/content.gyp:content_app_browser', + '../content/content.gyp:content_app_both', ], 'include_dirs': [ '..', diff --git a/chrome/chrome_shell.gypi b/chrome/chrome_shell.gypi index 514e076..ea368a0 100644 --- a/chrome/chrome_shell.gypi +++ b/chrome/chrome_shell.gypi @@ -19,7 +19,7 @@ '../base/base.gyp:base', 'chrome_android_core', 'chrome.gyp:browser_ui', - '../content/content.gyp:content_app_browser', + '../content/content.gyp:content_app_both', ], 'direct_dependent_settings': { 'ldflags': [ |