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

Unified Diff: components/policy.gypi

Issue 258743005: Enable Enterprise enrollment on desktop builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: added arg to PathService::OverrideAndCreateIfNeeded, added test for FakeCryptohomeClient::InstallAt… 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
Index: components/policy.gypi
diff --git a/components/policy.gypi b/components/policy.gypi
index a47d88101efa09bb9b6e2c173ad9c551bd316d42..d99f7af4f555d13ede2a216a00ebe6c01f801d1c 100644
--- a/components/policy.gypi
+++ b/components/policy.gypi
@@ -128,13 +128,15 @@
},
{
'target_name': 'cloud_policy_proto_generated_compile',
- 'type': 'static_library',
+ 'type': '<(component)',
'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',
@@ -142,6 +144,9 @@
'includes': [
'../build/protoc.gypi',
],
+ 'defines': [
+ 'POLICY_PROTO_COMPILATION',
+ ],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [4267, ],
},
@@ -194,7 +199,7 @@
},
{
'target_name': 'cloud_policy_proto',
- 'type': 'static_library',
+ 'type': '<(component)',
'sources': [
'policy/proto/chrome_extension_policy.proto',
'policy/proto/device_management_backend.proto',
@@ -204,6 +209,8 @@
'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',
@@ -220,6 +227,9 @@
],
}],
],
+ 'defines': [
+ 'POLICY_PROTO_COMPILATION',
+ ],
},
{
'target_name': 'policy_test_support',

Powered by Google App Engine
This is Rietveld 408576698