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

Unified Diff: components/policy.gypi

Issue 265013002: Revert of Enable Enterprise enrollment on desktop builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | « chromeos/system/statistics_provider.cc ('k') | components/policy/policy_proto_export.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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',
],
},
{
« no previous file with comments | « chromeos/system/statistics_provider.cc ('k') | components/policy/policy_proto_export.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698