| Index: build/android/gyp/write_build_config.py
|
| diff --git a/build/android/gyp/write_build_config.py b/build/android/gyp/write_build_config.py
|
| index 5c6c721ce7ba77623ba486a585aac16b20337ca0..2303dc54afc8fc539038103ecd5313bbfd5e71e2 100755
|
| --- a/build/android/gyp/write_build_config.py
|
| +++ b/build/android/gyp/write_build_config.py
|
| @@ -433,23 +433,23 @@ def main(argv):
|
| gradle['dependent_java_projects'].append(c['path'])
|
|
|
|
|
| - if (options.type in ('java_binary', 'java_library') and
|
| - not options.bypass_platform_checks):
|
| + if (options.type in ('java_binary', 'java_library')):
|
| deps_info['requires_android'] = options.requires_android
|
| deps_info['supports_android'] = options.supports_android
|
|
|
| - deps_require_android = (all_resources_deps +
|
| - [d['name'] for d in all_library_deps if d['requires_android']])
|
| - deps_not_support_android = (
|
| - [d['name'] for d in all_library_deps if not d['supports_android']])
|
| + if not options.bypass_platform_checks:
|
| + deps_require_android = (all_resources_deps +
|
| + [d['name'] for d in all_library_deps if d['requires_android']])
|
| + deps_not_support_android = (
|
| + [d['name'] for d in all_library_deps if not d['supports_android']])
|
|
|
| - if deps_require_android and not options.requires_android:
|
| - raise Exception('Some deps require building for the Android platform: ' +
|
| - str(deps_require_android))
|
| + if deps_require_android and not options.requires_android:
|
| + raise Exception('Some deps require building for the Android platform: '
|
| + + str(deps_require_android))
|
|
|
| - if deps_not_support_android and options.supports_android:
|
| - raise Exception('Not all deps support the Android platform: ' +
|
| - str(deps_not_support_android))
|
| + if deps_not_support_android and options.supports_android:
|
| + raise Exception('Not all deps support the Android platform: '
|
| + + str(deps_not_support_android))
|
|
|
| if options.type in ('java_binary', 'java_library', 'android_apk'):
|
| deps_info['jar_path'] = options.jar_path
|
|
|