summaryrefslogtreecommitdiffstats
path: root/build/common.gypi
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-28 05:36:50 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-28 05:36:50 +0000
commitb11c0cc0631d39c028385962f87cef5c1d9d9d87 (patch)
tree5fd7d5e72e8ed817038959883f86e7e1463dbd4c /build/common.gypi
parent9c60c96658aadc7de9601a9f7a7f3f0aeb52434e (diff)
downloadchromium_src-b11c0cc0631d39c028385962f87cef5c1d9d9d87.zip
chromium_src-b11c0cc0631d39c028385962f87cef5c1d9d9d87.tar.gz
chromium_src-b11c0cc0631d39c028385962f87cef5c1d9d9d87.tar.bz2
Organize file lists in chrome_browser_ui.gypi
The main change is that there are no longer any ChromeOS exclusion lists. It also cleans up the definition of all_list in common.gypi now that Linux assume aura. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/334723005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
-rw-r--r--build/common.gypi5
1 files changed, 2 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 0db92c8..a6f8068 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -194,9 +194,8 @@
'enable_hidpi%': 1,
}],
- # Enable App Launcher on ChromeOS, Windows and OSX.
- # On Linux, enable App Launcher for the Aura build.
- ['use_ash==1 or OS=="win" or OS=="mac" or (desktop_linux==1 and use_aura==1)', {
+ # Enable App Launcher everywhere but mobile.
+ ['OS!="ios" and OS!="android"', {
'enable_app_list%': 1,
}, {
'enable_app_list%': 0,