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

Unified Diff: components/components_tests.gyp

Issue 132233031: Build with configuration_policy enabled on iOS by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 11 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 | « build/common.gypi ('k') | components/policy/core/common/generate_policy_source_unittest.cc » ('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 c3a984bc583e4f15e6521796d6766b99d0cff430..a90cd78651fd9bb586d0e338ccd6e2ab665abc29 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -164,6 +164,13 @@
['include', '^signin/'],
['include', '^translate/'],
],
+ 'conditions': [
+ ['configuration_policy==1', {
+ 'sources/': [
+ ['include', '^policy/'],
+ ],
+ }],
+ ],
}],
['disable_nacl==0', {
'sources': [
@@ -259,15 +266,19 @@
],
'conditions': [
['OS=="android" or OS=="ios"', {
- 'sources!': [
- 'policy/core/common/async_policy_provider_unittest.cc',
- 'policy/core/common/cloud/component_cloud_policy_service_unittest.cc',
- 'policy/core/common/cloud/component_cloud_policy_store_unittest.cc',
- 'policy/core/common/cloud/component_cloud_policy_updater_unittest.cc',
- 'policy/core/common/cloud/external_policy_data_fetcher_unittest.cc',
- 'policy/core/common/cloud/external_policy_data_updater_unittest.cc',
- 'policy/core/common/cloud/resource_cache_unittest.cc',
- 'policy/core/common/config_dir_policy_loader_unittest.cc',
+ # Note: 'sources!' is processed before any 'sources/', so the
+ # ['include', '^policy/'] on iOS above will include all of the
+ # policy source files again. Using 'source/' here too will get
+ # these files excluded as expected.
jochen (gone - plz use gerrit) 2014/01/22 11:28:48 that comment is kinda moot assuming you know the g
+ 'sources/': [
+ ['exclude', '^policy/core/common/async_policy_provider_unittest\\.cc'],
+ ['exclude', '^policy/core/common/cloud/component_cloud_policy_service_unittest\\.cc'],
+ ['exclude', '^policy/core/common/cloud/component_cloud_policy_store_unittest\\.cc'],
+ ['exclude', '^policy/core/common/cloud/component_cloud_policy_updater_unittest\\.cc'],
+ ['exclude', '^policy/core/common/cloud/external_policy_data_fetcher_unittest\\.cc'],
+ ['exclude', '^policy/core/common/cloud/external_policy_data_updater_unittest\\.cc'],
+ ['exclude', '^policy/core/common/cloud/resource_cache_unittest\\.cc'],
+ ['exclude', '^policy/core/common/config_dir_policy_loader_unittest\\.cc'],
],
}],
['chromeos==1', {
« no previous file with comments | « build/common.gypi ('k') | components/policy/core/common/generate_policy_source_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698