| OLD | NEW | 
|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 import("//build/config/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") | 
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") | 
| 7 import("//components/policy/resources/policy_templates.gni") | 7 import("//components/policy/resources/policy_templates.gni") | 
| 8 import("//third_party/protobuf/proto_library.gni") | 8 import("//third_party/protobuf/proto_library.gni") | 
| 9 import("//tools/grit/grit_rule.gni") | 9 import("//tools/grit/grit_rule.gni") | 
| 10 | 10 | 
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 56     ] | 56     ] | 
| 57   } | 57   } | 
| 58   component("policy_component_common") { | 58   component("policy_component_common") { | 
| 59     public_deps = [ | 59     public_deps = [ | 
| 60       "//components/policy/core/common", | 60       "//components/policy/core/common", | 
| 61     ] | 61     ] | 
| 62   } | 62   } | 
| 63 } | 63 } | 
| 64 | 64 | 
| 65 if (enable_configuration_policy) { | 65 if (enable_configuration_policy) { | 
| 66   # TODO(brettw) this component should use target_gen_dir instead but the GYP | 66   # TODO(GYP_GONE) this component should use target_gen_dir instead but the GYP | 
| 67   # build puts everything into the following directory. We do the same for now. | 67   # build puts everything into the following directory. We do the same for now. | 
|  | 68   # Fix when GYP is gone. | 
| 68   policy_gen_dir = "$root_gen_dir/policy" | 69   policy_gen_dir = "$root_gen_dir/policy" | 
| 69 | 70 | 
| 70   # This protobuf is equivalent to chrome_settings.proto but shares messages | 71   # This protobuf is equivalent to chrome_settings.proto but shares messages | 
| 71   # for policies of the same type, so that less classes have to be generated | 72   # for policies of the same type, so that less classes have to be generated | 
| 72   # and compiled. | 73   # and compiled. | 
| 73   cloud_policy_proto_path = "$policy_gen_dir/cloud_policy.proto" | 74   cloud_policy_proto_path = "$policy_gen_dir/cloud_policy.proto" | 
| 74 | 75 | 
| 75   # This is the "full" protobuf, which defines one protobuf message per | 76   # This is the "full" protobuf, which defines one protobuf message per | 
| 76   # policy. It is also the format currently used by the server. | 77   # policy. It is also the format currently used by the server. | 
| 77   chrome_settings_proto_path = "$policy_gen_dir/chrome_settings.proto" | 78   chrome_settings_proto_path = "$policy_gen_dir/chrome_settings.proto" | 
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 387       bundle_root_dir = "$root_out_dir/$chrome_mac_bundle_id.manifest/Contents" | 388       bundle_root_dir = "$root_out_dir/$chrome_mac_bundle_id.manifest/Contents" | 
| 388       bundle_resources_dir = "$bundle_root_dir/Resources" | 389       bundle_resources_dir = "$bundle_root_dir/Resources" | 
| 389 | 390 | 
| 390       deps = [ | 391       deps = [ | 
| 391         ":manifest_bundle_data", | 392         ":manifest_bundle_data", | 
| 392         ":manifest_strings_bundle_data", | 393         ":manifest_strings_bundle_data", | 
| 393       ] | 394       ] | 
| 394     } | 395     } | 
| 395   } | 396   } | 
| 396 } | 397 } | 
| OLD | NEW | 
|---|