summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_android.gypi
diff options
context:
space:
mode:
authormichaelbai <michaelbai@chromium.org>2015-03-04 14:44:31 -0800
committerCommit bot <commit-bot@chromium.org>2015-03-04 22:45:21 +0000
commit34a24da6b5dee735edecd2260253660fa9d56e97 (patch)
treefbaf54a5a1291c8ba2d9683b194671a136c7faf7 /chrome/chrome_android.gypi
parenta7ee74f6c4c305ec4d964af49d95af90eaab3cd3 (diff)
downloadchromium_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/chrome_android.gypi')
-rw-r--r--chrome/chrome_android.gypi2
1 files changed, 1 insertions, 1 deletions
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': [
'..',