Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8597)

Unified Diff: chrome/chrome.gyp

Issue 1334253002: Fix running gyp with configuration_policy=0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: History rewrite Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/components_tests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index bda7831b462473a0d7c2bac8c4d056747fd184c3..900280ca898b61c11728a1338bbfaefa96ea3bc1 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',
],
}],
],
« no previous file with comments | « no previous file | components/components_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698