| Index: chrome/app/BUILD.gn
|
| diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
|
| index dbc8c7c50757bf5d23a1b19f3f487e5b54711aee..cae879864e3035ed1883ce87562037e6321cac92 100644
|
| --- a/chrome/app/BUILD.gn
|
| +++ b/chrome/app/BUILD.gn
|
| @@ -4,7 +4,6 @@
|
|
|
| import("//tools/grit/grit_rule.gni")
|
|
|
| -
|
| if (is_android) {
|
| import("//build/config/android/rules.gni")
|
| android_generated_java_resources = [
|
| @@ -127,11 +126,8 @@ grit("generated_resources") {
|
| if (is_android) {
|
| java_strings_grd_prebuilt("java_strings_grd") {
|
| grit_output_dir = "$root_gen_dir/chrome/java/res"
|
| - generated_files = rebase_path(
|
| - android_generated_java_resources,
|
| - "java/res",
|
| - "."
|
| - )
|
| + generated_files =
|
| + rebase_path(android_generated_java_resources, "java/res", ".")
|
| }
|
| }
|
|
|
| @@ -142,13 +138,19 @@ action("make_generated_resources_map") {
|
|
|
| script = "//chrome/browser/metrics/variations/generate_resources_map.py"
|
|
|
| - inputs = [ "$root_gen_dir/chrome/grit/generated_resources.h" ]
|
| - outputs = [ "$root_gen_dir/chrome/generated_resources_map.cc" ]
|
| + inputs = [
|
| + "$root_gen_dir/chrome/grit/generated_resources.h",
|
| + ]
|
| + outputs = [
|
| + "$root_gen_dir/chrome/generated_resources_map.cc",
|
| + ]
|
|
|
| - args = rebase_path(inputs, root_build_dir) +
|
| - rebase_path(outputs, root_build_dir)
|
| + args =
|
| + rebase_path(inputs, root_build_dir) + rebase_path(outputs, root_build_dir)
|
|
|
| - deps = [ ":generated_resources" ]
|
| + deps = [
|
| + ":generated_resources",
|
| + ]
|
| }
|
|
|
| # Collect the generated .cc file from make_generated_resources_map and put it
|
|
|