| Index: components/nacl/nacl_defines.gypi
|
| diff --git a/components/nacl/nacl_defines.gypi b/components/nacl/nacl_defines.gypi
|
| index 31b81b79652ac3cd653123595b041759ae472b41..fdcdf960c0bc903f2c199d5e2660cfdb4e541588 100644
|
| --- a/components/nacl/nacl_defines.gypi
|
| +++ b/components/nacl/nacl_defines.gypi
|
| @@ -26,10 +26,10 @@
|
| 'NACL_OSX=1',
|
| ],
|
| }],
|
| - # "disabled_nacl" is always set to "1" when building for "ios", so
|
| - # set "nacl_defines" to the empty list to ensure the variable is
|
| + # "disabled_nacl" is always set to "1" when building for "ios" or android,
|
| + # so set "nacl_defines" to the empty list to ensure the variable is
|
| # always defined.
|
| - ['OS=="ios"', {
|
| + ['OS=="ios" or OS=="android"', {
|
| 'nacl_defines': [
|
| ],
|
| }],
|
|
|