diff options
-rw-r--r-- | chrome/chrome.gyp | 7 | ||||
-rw-r--r-- | components/components_tests.gyp | 14 | ||||
-rw-r--r-- | components/policy/core/browser/BUILD.gn | 4 | ||||
-rw-r--r-- | components/policy/core/common/BUILD.gn | 4 | ||||
-rw-r--r-- | remoting/host/BUILD.gn | 5 | ||||
-rw-r--r-- | remoting/remoting_test.gypi | 12 |
6 files changed, 35 insertions, 11 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', ], }], ], diff --git a/components/components_tests.gyp b/components/components_tests.gyp index 3e5a94a..deb5c70 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -1082,10 +1082,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', @@ -1668,11 +1672,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': [ diff --git a/components/policy/core/browser/BUILD.gn b/components/policy/core/browser/BUILD.gn index d6441ad..f58d532 100644 --- a/components/policy/core/browser/BUILD.gn +++ b/components/policy/core/browser/BUILD.gn @@ -88,9 +88,11 @@ source_set("unit_tests") { "url_blacklist_policy_handler_unittest.cc", ] deps = [ - "//components/policy:policy_component_test_support", "//components/url_formatter", "//testing/gmock", "//testing/gtest", ] + if (enable_configuration_policy) { + deps += [ "//components/policy:policy_component_test_support" ] + } } diff --git a/components/policy/core/common/BUILD.gn b/components/policy/core/common/BUILD.gn index 30838e9..dcdd6a7 100644 --- a/components/policy/core/common/BUILD.gn +++ b/components/policy/core/common/BUILD.gn @@ -261,8 +261,10 @@ source_set("unit_tests") { } deps = [ - "//components/policy:policy_component_test_support", "//testing/gmock", "//testing/gtest", ] + if (enable_configuration_policy) { + deps += [ "//components/policy:policy_component_test_support" ] + } } diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn index 57a1f59..7d171a8 100644 --- a/remoting/host/BUILD.gn +++ b/remoting/host/BUILD.gn @@ -439,7 +439,6 @@ if (is_mac) { # TODO(GYP) Mac build of remoting host. deps = [ "//base", "//base:i18n", - "//components/policy", "//components/policy:policy_component_common", "//net", "//remoting/base", @@ -448,6 +447,10 @@ if (is_mac) { # TODO(GYP) Mac build of remoting host. "//third_party/webrtc/modules/desktop_capture", ] + if (enable_configuration_policy) { + deps += [ "//components/policy" ] + } + if (enable_webrtc) { deps += [ "//third_party/libjingle:libjingle_webrtc" ] } diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi index b1a02c7..996760c 100644 --- a/remoting/remoting_test.gypi +++ b/remoting/remoting_test.gypi @@ -10,7 +10,6 @@ 'type': 'static_library', 'dependencies': [ '../base/base.gyp:base', - '../components/components.gyp:policy_component_test_support', '../net/net.gyp:net_test_support', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -114,6 +113,11 @@ ['exclude', '^host/'], ] }], + ['configuration_policy == 1', { + 'dependencies': [ + '../components/components.gyp:policy_component_test_support', + ], + }], ], }, { @@ -176,7 +180,6 @@ '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../base/base.gyp:test_support_base', - '../components/components.gyp:policy', '../ipc/ipc.gyp:ipc', '../net/net.gyp:net_test_support', '../ppapi/ppapi.gyp:ppapi_cpp', @@ -398,6 +401,11 @@ '../base/allocator/allocator.gyp:allocator', ], }], + ['configuration_policy == 1', { + 'dependencies': [ + '../components/components.gyp:policy', + ], + }], ], # end of 'conditions' }, # end of target 'remoting_unittests' { |