Merge from Chromium at DEPS revision r190564
This commit was generated by merge_to_master.py.
Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
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',