summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryfriedman <yfriedman@chromium.org>2015-06-18 18:19:35 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-19 01:20:15 +0000
commit29d8e3b989cb4938640639ce90de488e5ca90c12 (patch)
treecc2297fb083608400e0bb52ea8ba758575516cd4
parent7b8748fee7c6d363aed73bdc67ace8c316fe8635 (diff)
downloadchromium_src-29d8e3b989cb4938640639ce90de488e5ca90c12.zip
chromium_src-29d8e3b989cb4938640639ce90de488e5ca90c12.tar.gz
chromium_src-29d8e3b989cb4938640639ce90de488e5ca90c12.tar.bz2
Extend unknown_deps for build_configs exemption to android_resources.
Previously only apks were eligible, but both can depend on an AndroidManifest which doesn't write a build config. BUG=500587 Review URL: https://codereview.chromium.org/1181613005 Cr-Commit-Position: refs/heads/master@{#335187}
-rwxr-xr-xbuild/android/gyp/write_build_config.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/build/android/gyp/write_build_config.py b/build/android/gyp/write_build_config.py
index 8507a95..3773e98 100755
--- a/build/android/gyp/write_build_config.py
+++ b/build/android/gyp/write_build_config.py
@@ -181,7 +181,8 @@ def main(argv):
possible_deps_config_paths = build_utils.ParseGypList(
options.possible_deps_configs)
- allow_unknown_deps = options.type == 'android_apk'
+ allow_unknown_deps = (options.type == 'android_apk' or
+ options.type == 'android_resources')
unknown_deps = [
c for c in possible_deps_config_paths if not os.path.exists(c)]
if unknown_deps and not allow_unknown_deps: