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

Unified Diff: components/components_tests.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 | « chrome/chrome.gyp ('k') | components/policy/core/browser/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 6d1e35e1267647cdaf9a48b65814ad4d01a62a38..3b74a72866a8d3927d577ddf0d5097d69570c1c4 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -1076,10 +1076,14 @@
'conditions': [
['OS=="android"', {
'dependencies': [
- 'components.gyp:policy_java',
'../build/android/ndk.gyp:cpu_features',
],
}],
+ ['OS=="android" and configuration_policy == 1', {
+ 'dependencies': [
+ 'components.gyp:policy_java',
+ ],
+ }],
['use_openssl==1', {
'dependencies': [
'../third_party/boringssl/boringssl.gyp:boringssl',
@@ -1662,11 +1666,17 @@
'type': 'none',
'dependencies': [
'components.gyp:invalidation_java',
- 'components.gyp:policy_java',
'../base/base.gyp:base_java',
'../base/base.gyp:base_java_test_support',
'../testing/android/junit/junit_test.gyp:junit_test_support',
],
+ 'conditions': [
+ ['configuration_policy == 1', {
+ 'dependencies': [
+ 'components.gyp:policy_java',
+ ],
+ }],
+ ],
'variables': {
'main_class': 'org.chromium.testing.local.JunitTestMain',
'src_paths': [
« no previous file with comments | « chrome/chrome.gyp ('k') | components/policy/core/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698