diff options
| author | the_jk <the_jk@opera.com> | 2015-09-15 09:14:58 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-15 16:15:33 +0000 |
| commit | a7b7b998391c399fdfbafb4df10645a0f2ce9c5b (patch) | |
| tree | b8691764901e60f4278f335aeecbfb76f5846494 /chrome/chrome.gyp | |
| parent | 3ddcd84850a1bfe9f4b3974f355abce66f4e35ab (diff) | |
| download | chromium_src-a7b7b998391c399fdfbafb4df10645a0f2ce9c5b.zip chromium_src-a7b7b998391c399fdfbafb4df10645a0f2ce9c5b.tar.gz chromium_src-a7b7b998391c399fdfbafb4df10645a0f2ce9c5b.tar.bz2 | |
Fix running gyp with configuration_policy=0
Running gyp in chromium with configuration_policy set to 0 fails as
multiple targets that are behind condition of configuration_policy==1
are referenced without corresponding conditionals
BUG=530579
Review URL: https://codereview.chromium.org/1334253002
Cr-Commit-Position: refs/heads/master@{#348903}
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index bda7831..900280c 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -588,7 +588,6 @@ 'shortcut_source_java', '../base/base.gyp:base', '../chrome/android/chrome_apk.gyp:custom_tabs_service_aidl', - '../components/components.gyp:app_restrictions_resources', '../components/components.gyp:bookmarks_java', '../components/components.gyp:dom_distiller_core_java', '../components/components.gyp:enhanced_bookmarks_java_enums_srcjar', @@ -596,7 +595,6 @@ '../components/components.gyp:invalidation_java', '../components/components.gyp:navigation_interception_java', '../components/components.gyp:offline_pages_enums_java', - '../components/components.gyp:policy_java', '../components/components.gyp:precache_java', '../components/components.gyp:safe_json_java', '../components/components.gyp:service_tab_launcher_java', @@ -641,9 +639,10 @@ ], }, 'conditions': [ - ['configuration_policy != 1', { - 'dependencies!': [ + ['configuration_policy == 1', { + 'dependencies': [ '../components/components.gyp:app_restrictions_resources', + '../components/components.gyp:policy_java', ], }], ], |