diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 18:24:30 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 18:24:30 +0000 |
| commit | 070c7eafa0c67dc57e90b740d3923f69274c0a75 (patch) | |
| tree | 2af6fe855575853702757bcf36c0303e74f15384 /build | |
| parent | c4a51f8e4bb893c6ef6dd87a9cee8965c92cfbad (diff) | |
| download | chromium_src-070c7eafa0c67dc57e90b740d3923f69274c0a75.zip chromium_src-070c7eafa0c67dc57e90b740d3923f69274c0a75.tar.gz chromium_src-070c7eafa0c67dc57e90b740d3923f69274c0a75.tar.bz2 | |
Add missing base files to GN build.
Fix the devtools resources target to use the grit template.
Fix the grit template to use the correct output directory for the expected files if one is specified
R=viettrungluu@chromium.org
Review URL: https://codereview.chromium.org/414973002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285334 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/config/android/rules.gni | 7 | ||||
| -rw-r--r-- | build/secondary/tools/grit/grit_rule.gni | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni index f18c86a..c6b7cc1 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -362,17 +362,16 @@ template("java_strings_grd") { "-E", "ANDROID_JAVA_TAGGED_ONLY=false", ] output_dir = grit_output_dir + print("output_dir", output_dir) resource_ids = "" source = invoker.grd_file - # The grit rule expects files relative to target_gen_dir, but this rule - # appends a suffix to that. This rebase will prepend extra_output_path to - # each filename. - outputs = rebase_path(invoker.outputs, ".", extra_output_path) + outputs = invoker.outputs } # This needs to get outputs from grit's internal target, not the final # source_set. generate_strings_outputs = get_target_outputs(":${grit_target_name}_grit") + print("gen outputs", generate_strings_outputs) zip("${target_name}__zip") { base_dir = grit_output_dir diff --git a/build/secondary/tools/grit/grit_rule.gni b/build/secondary/tools/grit/grit_rule.gni index b5252c6..3abbdb8 100644 --- a/build/secondary/tools/grit/grit_rule.gni +++ b/build/secondary/tools/grit/grit_rule.gni @@ -228,12 +228,12 @@ template("grit") { # are the actual outputs at runtime. asserted_list_file = "$target_out_dir/${target_name}_expected_outputs.txt" write_file(asserted_list_file, - rebase_path(invoker.outputs, root_build_dir, target_gen_dir)) + rebase_path(invoker.outputs, root_build_dir, output_dir)) assert_files_flags += [ "--assert-file-list=" + rebase_path(asserted_list_file, root_build_dir), ] grit_outputs = get_path_info( - rebase_path(invoker.outputs, ".", target_gen_dir), + rebase_path(invoker.outputs, ".", output_dir), "abspath") # The config and the action below get this visibility son only the generated |