29 lines
1.9 KiB
Diff
29 lines
1.9 KiB
Diff
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
|
|
index 4cf41b78179a1b54faf9ea6de5ce40af82931841..76fa6d1b90cb8bef7f3b1e2ca3d9bd1fee794e9d 100644
|
|
--- a/build/config/android/internal_rules.gni
|
|
+++ b/build/config/android/internal_rules.gni
|
|
@@ -3650,6 +3650,7 @@ if (enable_java_templates) {
|
|
# Filter directly in compile_java.py when no other processing is required.
|
|
_processed_jar_path = _javac_jar_path
|
|
}
|
|
+ foreach(bytecode_jar, brave_bytecode_jars) { if (rebase_path(_javac_jar_path, root_build_dir) == bytecode_jar) { _processed_jar_path = "$target_out_dir/$target_name.bytecode-rewritten.jar" } }
|
|
}
|
|
|
|
if (_build_device_jar) {
|
|
@@ -3857,6 +3858,7 @@ if (enable_java_templates) {
|
|
if (defined(_enable_bytecode_checks) && _enable_bytecode_checks) {
|
|
enable_bytecode_checks = _enable_bytecode_checks
|
|
}
|
|
+ if (_type == "java_library") { needs_full_javac_classpath = true }
|
|
|
|
# Specifically avoid passing in invoker.base_module_target as one of the
|
|
# possible_config_deps.
|
|
@@ -4246,6 +4248,7 @@ if (enable_java_templates) {
|
|
} else {
|
|
not_needed(invoker, [ "missing_classes_allowlist" ])
|
|
}
|
|
+ _rebased_unprocessed_jar_path = rebase_path(_unprocessed_jar_path, root_build_dir) _rebased_javac_jar_path = "" if (_has_sources) { _rebased_javac_jar_path = rebase_path(_javac_jar_path, root_build_dir) } foreach(bytecode_jar, brave_bytecode_jars) { if (_rebased_unprocessed_jar_path == bytecode_jar || _rebased_javac_jar_path == bytecode_jar) { _bytecode_rewriter_output_jar = _processed_jar_path brave_bytecode_rewriter("${target_name}__bytecode_rewrite") { build_config = _build_config } _unprocessed_jar_deps += [ ":${target_name}__bytecode_rewrite" ] _unprocessed_jar_path = _bytecode_rewriter_output_jar } }
|
|
|
|
if (_filter_jar && _is_prebuilt) {
|
|
_filter_jar_target_name = "${target_name}__filter_jar"
|