Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1193)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/common.gypi

Issue 11361056: Add structural support for building chrome_browser.gyp on iOS (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Add comment Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 569772f121f601f5e81c3740f79b2232c2df08b0..6f1e8d1c5c500ae950725471a30f812543f16ff6 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -520,7 +520,7 @@
'linux_use_gold_flags%': 0,
}],
- ['OS=="android"', {
+ ['OS=="android" or OS=="ios"', {
'enable_captive_portal_detection%': 0,
}, {
'enable_captive_portal_detection%': 1,
@@ -963,6 +963,7 @@
}], # os_posix==1 and OS!="mac" and OS!="ios"
['OS=="ios"', {
'disable_nacl%': 1,
+ 'enable_background%': 0,
'enable_gpu%': 0,
'enable_task_manager%': 0,
'icu_use_data_file_flag%': 1,
« no previous file with comments | « no previous file | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698