Chromium Code Reviews| Index: remoting/android/BUILD.gn |
| diff --git a/remoting/android/BUILD.gn b/remoting/android/BUILD.gn |
| index f6c21856dc3a2d4f1c16ded3e211600c34c9f23f..704ea7a52a4324e59f7bff61cb22200940fd6140 100644 |
| --- a/remoting/android/BUILD.gn |
| +++ b/remoting/android/BUILD.gn |
| @@ -5,6 +5,7 @@ |
| import("//build/config/android/config.gni") |
| import("//build/config/android/rules.gni") |
| import("//remoting/android/client_java_tmpl.gni") |
| +import("//remoting/android/credits_tmpl.gni") |
| import("//remoting/android/remoting_apk_tmpl.gni") |
| import("//remoting/remoting_options.gni") |
| import("//remoting/tools/build/remoting_localize.gni") |
| @@ -64,50 +65,8 @@ shared_library("remoting_client_jni") { |
| assert_no_deps = [ "//third_party/ffmpeg:*" ] |
| } |
| -action("credits") { |
| - credits_html_file = "$target_gen_dir/credits.html" |
| - script = "//tools/licenses.py" |
| - depfile = "$target_gen_dir/$target_name.d" |
| - credits_template = "//remoting/credits/credits.tmpl" |
| - credits_entry_template = "//remoting/credits/credits_entry.tmpl" |
| - inputs = [ |
| - credits_template, |
| - credits_entry_template, |
| - ] |
| - outputs = [ |
| - credits_html_file, |
| - ] |
| - args = [ |
| - "credits", |
| - rebase_path(credits_html_file, root_build_dir), |
| - "--file-template", |
| - rebase_path(credits_template, root_build_dir), |
| - "--entry-template", |
| - rebase_path(credits_entry_template, root_build_dir), |
| - "--depfile", |
| - rebase_path(depfile, root_build_dir), |
| - "--gn-target", |
| - "//remoting/android:remoting_apk", |
| - "--gn-out-dir", |
| - rebase_path(root_build_dir), |
| - ] |
| -} |
| - |
| -_raw_resources_base_dir = "$target_gen_dir/remoting_android_raw_resources/res" |
| -copy("remoting_android_raw_resources") { |
| - _credits_html = get_label_info("//remoting/android:credits", |
| - "target_gen_dir") + "/credits.html" |
| - sources = [ |
| - "//remoting/credits/credits_css.css", |
| - "//remoting/credits/credits_js.js", |
| - _credits_html, |
| - ] |
| - outputs = [ |
| - "$_raw_resources_base_dir/raw/{{source_file_part}}", |
| - ] |
| - deps = [ |
| - ":credits", |
| - ] |
| +remoting_android_credits("credits") { |
| + gn_target = "//remoting/android:remoting_apk" |
| } |
| remoting_localize("remoting_apk_manifest") { |
| @@ -122,12 +81,12 @@ remoting_localize("remoting_apk_manifest") { |
| android_resources("remoting_android_client_java_resources") { |
| custom_package = "org.chromium.chromoting" |
| resource_dirs = [ "java/res" ] |
| - generated_resource_dirs = [ _raw_resources_base_dir ] |
| - generated_resource_files = |
| - get_target_outputs(":remoting_android_raw_resources") |
| - |
| + generated_resource_dirs = |
| + [ get_label_info(":credits_resources_raw", "target_gen_dir") + |
| + "/credits_resources_raw/res" ] |
| + generated_resource_files = get_target_outputs(":credits_resources_raw") |
| deps = [ |
| - ":remoting_android_raw_resources", |
| + ":credits_resources_raw", |
|
agrieve
2017/03/21 02:07:13
It's a little bit bad form to depend on a generate
Lambros
2017/03/22 21:31:00
Done (added __generate to the action target)
|
| "//remoting/resources:strings_java", |
| "//third_party/android_tools:android_support_v7_appcompat_java", |
| ] |