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

Unified Diff: components/policy/BUILD.gn

Issue 1618243004: Use gn_helpers to deserialize GN lists. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 | « build/gn_helpers.py ('k') | mojo/public/mojo_application.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/policy/BUILD.gn
diff --git a/components/policy/BUILD.gn b/components/policy/BUILD.gn
index b5f7183f64370adb9ba2520aaa2cf171ce215e66..c13fb6f92085b7105ca9db25888b993c72379943 100644
--- a/components/policy/BUILD.gn
+++ b/components/policy/BUILD.gn
@@ -285,6 +285,7 @@ if (enable_configuration_policy) {
if (is_android) {
import("//build/config/android/rules.gni")
+ import("//build/config/zip.gni")
resources_name = "app_restrictions_resources"
resources_zip = "res.java/$resources_name.zip"
@@ -316,22 +317,11 @@ if (enable_configuration_policy) {
}
zip_target_name = "${resources_name}__create_zip"
- action(zip_target_name) {
- script = "//build/android/gn/zip.py"
- outputs = [
- "$root_build_dir/$resources_zip",
- ]
- generated_resources = get_target_outputs(":$consolidate_target_name") +
- policy_templates_android_outputs
- inputs = generated_resources
- rebased_inputs = rebase_path(generated_resources, root_build_dir)
- rebased_resources_dir =
- rebase_path(generated_resources_dir, root_build_dir)
- args = [
- "--inputs=$rebased_inputs",
- "--output=$resources_zip",
- "--base-dir=$rebased_resources_dir",
- ]
+ zip(zip_target_name) {
+ inputs = get_target_outputs(":$consolidate_target_name") +
+ policy_templates_android_outputs
+ output = "$root_build_dir/$resources_zip"
+ base_dir = generated_resources_dir
deps = [
":$consolidate_target_name",
":policy_templates_grit", # For policy_templates_android_outputs.
« no previous file with comments | « build/gn_helpers.py ('k') | mojo/public/mojo_application.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698