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 69acb2bb8a437911f524fcf0f98d42874774399c..6845dabdb35a966ad78755e45a2b45211583db12 100755 |
--- a/build/android/gyp/write_build_config.py |
+++ b/build/android/gyp/write_build_config.py |
@@ -200,8 +200,10 @@ |
'--type', |
help='Type of this target (e.g. android_library).') |
parser.add_option( |
- '--deps-configs', |
- help='List of paths for dependency\'s build_config files. ') |
+ '--possible-deps-configs', |
+ help='List of paths for dependency\'s build_config files. Some ' |
+ 'dependencies may not write build_config files. Missing build_config ' |
+ 'files are handled differently based on the type of this target.') |
# android_resources options |
parser.add_option('--srcjar', help='Path to target\'s resources srcjar.') |
@@ -288,7 +290,14 @@ |
raise Exception( |
'--supports-android is required when using --requires-android') |
- direct_deps_config_paths = build_utils.ParseGypList(options.deps_configs) |
+ possible_deps_config_paths = build_utils.ParseGypList( |
+ options.possible_deps_configs) |
+ |
+ unknown_deps = [ |
+ c for c in possible_deps_config_paths if not os.path.exists(c)] |
+ |
+ direct_deps_config_paths = [ |
+ c for c in possible_deps_config_paths if not c in unknown_deps] |
direct_deps_config_paths = _FilterUnwantedDepsPaths(direct_deps_config_paths, |
options.type) |