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

Unified Diff: components/policy.gypi

Issue 1220683008: Move AppRestriction to Policy code out of //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix more build errors Created 5 years, 5 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 ec76518ab236c6941b4e8b469b77dd32e3065b8a..5184e7e4b680cdd85ce1d9f5e8fa69554fdd37c5 100644
--- a/components/policy.gypi
+++ b/components/policy.gypi
@@ -103,7 +103,7 @@
{
'inputs': [
'policy/resources/policy_templates.json',
- '<(DEPTH)/chrome/VERSION',
+ '<(DEPTH)/chrome/VERSION',
'<(generate_policy_source_script_path)',
],
'outputs': [
@@ -124,7 +124,7 @@
'--cloud-policy-protobuf=<(cloud_policy_proto_path)',
'--cloud-policy-decoder=<(protobuf_decoder_path)',
'--app-restrictions-definition=<(app_restrictions_path)',
- '<(DEPTH)/chrome/VERSION',
+ '<(DEPTH)/chrome/VERSION',
'<(OS)',
'<(chromeos)',
'policy/resources/policy_templates.json',
@@ -382,7 +382,31 @@
'dependencies_res_zip_paths': ['<(resources_zip)'],
},
},
- }
+ },
+ {
+ # GN: //components/policy/android:jni_headers
+ 'target_name': 'policy_jni_headers',
+ 'type': 'none',
+ 'sources': [
+ 'policy/android/java/src/org/chromium/policy/AppRestrictionsImporter.java',
+ ],
+ 'variables': {
+ 'jni_gen_package': 'policy',
+ },
+ 'includes': [ '../build/jni_generator.gypi' ],
+ },
+ {
+ # GN: //components/policy/android:policy_java
+ 'target_name': 'policy_java',
+ 'type': 'none',
+ 'dependencies': [
+ '../base/base.gyp:base_java',
+ ],
+ 'variables': {
+ 'java_in_dir': 'policy/android/java',
+ },
+ 'includes': [ '../build/java.gypi' ],
+ },
],
}],
['OS=="win" and target_arch=="ia32" and configuration_policy==1', {

Powered by Google App Engine
This is Rietveld 408576698