diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-08 23:56:46 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-08 23:56:46 +0000 |
| commit | 91223bb8db5a22776b3b5d21eac5e496bf85cf02 (patch) | |
| tree | 6a9f9bd3d1b03a16d88de41ee0235621c8628b13 /chrome/chrome.gyp | |
| parent | 7b3da7209ab1843c4f3cb44cc0b8dadcc3333aef (diff) | |
| download | chromium_src-91223bb8db5a22776b3b5d21eac5e496bf85cf02.zip chromium_src-91223bb8db5a22776b3b5d21eac5e496bf85cf02.tar.gz chromium_src-91223bb8db5a22776b3b5d21eac5e496bf85cf02.tar.bz2 | |
Enabling android builds with configuration_policy enabled.
The configuration_policy flag in GYP determines whether Chrome is built with
policy support or not. This change fixes build issues when that flag is
enabled, but doesn't turn it on by default on Android.
TBR=jochen@chromium.org
BUG=247435
Review URL: https://chromiumcodereview.appspot.com/16359018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205086 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 01950c5..db90ea1 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -169,7 +169,6 @@ 'chrome_renderer.gypi', 'chrome_tests.gypi', 'nacl.gypi', - 'policy.gypi', '../apps/apps.gypi', ], 'targets': [ @@ -1158,5 +1157,8 @@ 'chrome_android.gypi', ]}, # 'includes' ], # OS=="android" + ['configuration_policy==1 and OS!="android"', { + 'includes': [ 'policy.gypi', ], + }], ], # 'conditions' } |