| Index: components/policy.gypi
|
| diff --git a/components/policy.gypi b/components/policy.gypi
|
| index d99f7af4f555d13ede2a216a00ebe6c01f801d1c..a47d88101efa09bb9b6e2c173ad9c551bd316d42 100644
|
| --- a/components/policy.gypi
|
| +++ b/components/policy.gypi
|
| @@ -128,24 +128,19 @@
|
| },
|
| {
|
| 'target_name': 'cloud_policy_proto_generated_compile',
|
| - 'type': '<(component)',
|
| + 'type': 'static_library',
|
| 'sources': [
|
| '<(cloud_policy_proto_path)',
|
| ],
|
| 'variables': {
|
| 'proto_in_dir': '<(policy_out_dir)/policy',
|
| 'proto_out_dir': 'policy/proto',
|
| - 'cc_generator_options': 'dllexport_decl=POLICY_PROTO_EXPORT:',
|
| - 'cc_include': 'components/policy/policy_proto_export.h',
|
| },
|
| 'dependencies': [
|
| 'cloud_policy_code_generate',
|
| ],
|
| 'includes': [
|
| '../build/protoc.gypi',
|
| - ],
|
| - 'defines': [
|
| - 'POLICY_PROTO_COMPILATION',
|
| ],
|
| # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
| 'msvs_disabled_warnings': [4267, ],
|
| @@ -199,7 +194,7 @@
|
| },
|
| {
|
| 'target_name': 'cloud_policy_proto',
|
| - 'type': '<(component)',
|
| + 'type': 'static_library',
|
| 'sources': [
|
| 'policy/proto/chrome_extension_policy.proto',
|
| 'policy/proto/device_management_backend.proto',
|
| @@ -209,8 +204,6 @@
|
| 'variables': {
|
| 'proto_in_dir': 'policy/proto',
|
| 'proto_out_dir': 'policy/proto',
|
| - 'cc_generator_options': 'dllexport_decl=POLICY_PROTO_EXPORT:',
|
| - 'cc_include': 'components/policy/policy_proto_export.h',
|
| },
|
| 'includes': [
|
| '../build/protoc.gypi',
|
| @@ -226,9 +219,6 @@
|
| 'policy/proto/device_management_local.proto',
|
| ],
|
| }],
|
| - ],
|
| - 'defines': [
|
| - 'POLICY_PROTO_COMPILATION',
|
| ],
|
| },
|
| {
|
|
|