summaryrefslogtreecommitdiffstats
path: root/sandbox/sandbox.gyp
diff options
context:
space:
mode:
authorjln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-19 18:26:18 +0000
committerjln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-19 18:26:18 +0000
commit0795982840095652cb7e0e64b227dfff861ebb77 (patch)
tree703660ba9e5ee36b0278ae1a9ff81287d44586b6 /sandbox/sandbox.gyp
parent36132026f76105e8dd4d665d234206c6813c7ecf (diff)
downloadchromium_src-0795982840095652cb7e0e64b227dfff861ebb77.zip
chromium_src-0795982840095652cb7e0e64b227dfff861ebb77.tar.gz
chromium_src-0795982840095652cb7e0e64b227dfff861ebb77.tar.bz2
Linux sandbox: compile partially under Android.
Get a subset of sandbox/linux to compile under Android. BUG=166704 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11612014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173954 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/sandbox.gyp')
-rw-r--r--sandbox/sandbox.gyp7
1 files changed, 3 insertions, 4 deletions
diff --git a/sandbox/sandbox.gyp b/sandbox/sandbox.gyp
index c953f08..b48727a 100644
--- a/sandbox/sandbox.gyp
+++ b/sandbox/sandbox.gyp
@@ -12,14 +12,13 @@
'win/sandbox_win.gypi',
],
}],
- [ 'OS=="linux"', {
+ [ 'OS=="linux" or OS=="android"', {
'includes': [
'linux/sandbox_linux.gypi',
],
}],
- [ 'OS!="win" and OS!="mac" and OS!="linux"', {
- # We need a 'default' to accomodate the "sandbox" target, for instance
- # on Android.
+ [ 'OS!="win" and OS!="mac" and OS!="linux" and OS!="android"', {
+ # A 'default' to accomodate the "sandbox" target.
'targets': [
{
'target_name': 'sandbox',