Patches for v143
This commit is contained in:
@@ -22,7 +22,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
|
||||
--- a/build/config/android/internal_rules.gni
|
||||
+++ b/build/config/android/internal_rules.gni
|
||||
@@ -610,12 +610,15 @@ template("write_build_config") {
|
||||
@@ -627,12 +627,15 @@ template("write_build_config") {
|
||||
} else {
|
||||
action_with_pydeps(target_name) {
|
||||
forward_variables_from(invoker, [ "testonly" ])
|
||||
@@ -39,7 +39,7 @@ diff --git a/build/config/android/internal_rules.gni b/build/config/android/inte
|
||||
"--output",
|
||||
rebase_path(invoker.build_config, root_build_dir),
|
||||
"--depfile",
|
||||
@@ -3018,17 +3021,18 @@ if (enable_java_templates) {
|
||||
@@ -3031,17 +3034,18 @@ if (enable_java_templates) {
|
||||
}
|
||||
|
||||
action_with_pydeps(target_name) {
|
||||
@@ -61,7 +61,7 @@ diff --git a/build/config/android/internal_rules.gni b/build/config/android/inte
|
||||
inputs = javac_paths_for_inputs
|
||||
}
|
||||
|
||||
@@ -3044,7 +3048,10 @@ if (enable_java_templates) {
|
||||
@@ -3057,7 +3061,10 @@ if (enable_java_templates) {
|
||||
deps += invoker.deps
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@ diff --git a/build/config/android/internal_rules.gni b/build/config/android/inte
|
||||
if (invoker.enable_errorprone) {
|
||||
_stamp_file = "$target_out_dir/$target_name.stamp"
|
||||
outputs = [ _stamp_file ]
|
||||
@@ -3242,7 +3249,8 @@ if (enable_java_templates) {
|
||||
@@ -3256,7 +3263,8 @@ if (enable_java_templates) {
|
||||
}
|
||||
|
||||
action_with_pydeps(target_name) {
|
||||
@@ -83,7 +83,7 @@ diff --git a/build/config/android/internal_rules.gni b/build/config/android/inte
|
||||
depfile = "$target_gen_dir/$target_name.d"
|
||||
deps = _srcjar_deps
|
||||
if (defined(invoker.deps)) {
|
||||
@@ -3271,6 +3279,8 @@ if (enable_java_templates) {
|
||||
@@ -3285,6 +3293,8 @@ if (enable_java_templates) {
|
||||
"$target_gen_dir/${invoker.main_target_name}/generated_java",
|
||||
root_build_dir)
|
||||
args = [
|
||||
|
||||
Reference in New Issue
Block a user