| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/android/config.gni") | 5 import("//build/config/android/config.gni") |
| 6 import("//build/config/android/internal_rules.gni") | 6 import("//build/config/android/internal_rules.gni") |
| 7 import("//tools/grit/grit_rule.gni") | 7 import("//tools/grit/grit_rule.gni") |
| 8 | 8 |
| 9 assert(is_android) | 9 assert(is_android) |
| 10 | 10 |
| (...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 # Put grit files into this subdirectory of target_gen_dir. | 355 # Put grit files into this subdirectory of target_gen_dir. |
| 356 extra_output_path = target_name + "_grit_output" | 356 extra_output_path = target_name + "_grit_output" |
| 357 | 357 |
| 358 grit_target_name = "${target_name}__grit" | 358 grit_target_name = "${target_name}__grit" |
| 359 grit_output_dir = "$target_gen_dir/$extra_output_path" | 359 grit_output_dir = "$target_gen_dir/$extra_output_path" |
| 360 grit(grit_target_name) { | 360 grit(grit_target_name) { |
| 361 grit_flags = [ | 361 grit_flags = [ |
| 362 "-E", "ANDROID_JAVA_TAGGED_ONLY=false", | 362 "-E", "ANDROID_JAVA_TAGGED_ONLY=false", |
| 363 ] | 363 ] |
| 364 output_dir = grit_output_dir | 364 output_dir = grit_output_dir |
| 365 print("output_dir", output_dir) | |
| 366 resource_ids = "" | 365 resource_ids = "" |
| 367 source = invoker.grd_file | 366 source = invoker.grd_file |
| 368 outputs = invoker.outputs | 367 outputs = invoker.outputs |
| 369 } | 368 } |
| 370 | 369 |
| 371 # This needs to get outputs from grit's internal target, not the final | 370 # This needs to get outputs from grit's internal target, not the final |
| 372 # source_set. | 371 # source_set. |
| 373 generate_strings_outputs = get_target_outputs(":${grit_target_name}_grit") | 372 generate_strings_outputs = get_target_outputs(":${grit_target_name}_grit") |
| 374 print("gen outputs", generate_strings_outputs) | |
| 375 | 373 |
| 376 zip("${target_name}__zip") { | 374 zip("${target_name}__zip") { |
| 377 base_dir = grit_output_dir | 375 base_dir = grit_output_dir |
| 378 inputs = generate_strings_outputs | 376 inputs = generate_strings_outputs |
| 379 output = resources_zip | 377 output = resources_zip |
| 380 } | 378 } |
| 381 | 379 |
| 382 group(target_name) { | 380 group(target_name) { |
| 383 deps = [ | 381 deps = [ |
| 384 ":${target_name}__build_config", | 382 ":${target_name}__build_config", |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 445 | 443 |
| 446 if (defined(invoker.jar_excluded_patterns)) { | 444 if (defined(invoker.jar_excluded_patterns)) { |
| 447 jar_excluded_patterns = invoker.jar_excluded_patterns | 445 jar_excluded_patterns = invoker.jar_excluded_patterns |
| 448 } | 446 } |
| 449 | 447 |
| 450 if (defined(invoker.srcjar_deps)) { | 448 if (defined(invoker.srcjar_deps)) { |
| 451 srcjar_deps = invoker.srcjar_deps | 449 srcjar_deps = invoker.srcjar_deps |
| 452 } | 450 } |
| 453 } | 451 } |
| 454 } | 452 } |
| OLD | NEW |