Chromium Code Reviews| Index: tools/gyp/all.gypi |
| diff --git a/tools/gyp/all.gypi b/tools/gyp/all.gypi |
| index 23d9f86a2d851ef1f6569d7cb9785ec42342d0a8..9b69a05dd3eface5c919f8c1654920fb1834a9ff 100644 |
| --- a/tools/gyp/all.gypi |
| +++ b/tools/gyp/all.gypi |
| @@ -12,6 +12,7 @@ |
| 'host_arch': 'ia32', |
| 'target_arch': 'ia32', |
| 'v8_location': '<(DEPTH)/third_party/v8', |
| + 'android_target_arch' : 'x86', |
| }, |
| 'conditions': [ |
| [ 'OS=="linux"', { |
| @@ -28,6 +29,13 @@ |
| 'includes': [ |
| 'xcode.gypi', |
| 'configurations.gypi', |
| - 'source_filter.gypi', |
| + 'source_filter.gypi' |
| + ], |
| + 'conditions': [ |
| + [ 'OS=="android"', { |
| + 'includes': [ |
| + 'android.gypi' |
| + ], |
| + }] |
| ], |
| } |