Commit 38181c28 authored by Robbie McElrath's avatar Robbie McElrath Committed by Commit Bot

[WebLayer] Add skeleton bytecode_rewriter_target parameter

This CL adds the bytecode_rewriter_target argument to the
google_play_services_basement_java target, and marks it as not_needed
in internal_rules.gni. The actual rewriting implementation will be
landed in a later CL, but this first step allows us to add the
bytecode_rewriter_target parameter where it's needed in Clank to avoid
breaking it when the real implementation is landed.

Bug: 1123216
Change-Id: I34c7af6582948b6fa07bc822d1c5f8ed8a9605b7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2527841Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825635}
parent b8d1857e
...@@ -3973,6 +3973,9 @@ if (enable_java_templates) { ...@@ -3973,6 +3973,9 @@ if (enable_java_templates) {
} }
} # _has_sources } # _has_sources
# TODO(crbug.com/1123216): Implement bytecode_rewriter_target.
not_needed(invoker, [ "bytecode_rewriter_target" ])
if (_is_prebuilt) { if (_is_prebuilt) {
generate_interface_jar(_header_target_name) { generate_interface_jar(_header_target_name) {
# Always used the unfiltered .jar to create the interface jar so that # Always used the unfiltered .jar to create the interface jar so that
......
...@@ -4369,6 +4369,7 @@ if (enable_java_templates) { ...@@ -4369,6 +4369,7 @@ if (enable_java_templates) {
# Create android_java_prebuilt target for classes.jar. # Create android_java_prebuilt target for classes.jar.
if (_scanned_files.has_classes_jar) { if (_scanned_files.has_classes_jar) {
_java_library_vars = [ _java_library_vars = [
"bytecode_rewriter_target",
"enable_bytecode_checks", "enable_bytecode_checks",
"enable_jetify", "enable_jetify",
"jar_excluded_patterns", "jar_excluded_patterns",
......
...@@ -1196,6 +1196,8 @@ android_aar_prebuilt("google_play_services_basement_java") { ...@@ -1196,6 +1196,8 @@ android_aar_prebuilt("google_play_services_basement_java") {
# https://crbug.com/989505 # https://crbug.com/989505
jar_excluded_patterns = [ "META-INF/proguard/*" ] jar_excluded_patterns = [ "META-INF/proguard/*" ]
input_jars_paths = [ "$android_sdk/optional/org.apache.http.legacy.jar" ] input_jars_paths = [ "$android_sdk/optional/org.apache.http.legacy.jar" ]
bytecode_rewriter_target =
"//build/android/bytecode:fragment_activity_replacer"
} }
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......
...@@ -505,6 +505,7 @@ class BuildConfigGenerator extends DefaultTask { ...@@ -505,6 +505,7 @@ class BuildConfigGenerator extends DefaultTask {
sb.append(' jar_excluded_patterns = ["META-INF/proguard/*"]\n') sb.append(' jar_excluded_patterns = ["META-INF/proguard/*"]\n')
// Deprecated deps jar but still needed by play services basement. // Deprecated deps jar but still needed by play services basement.
sb.append(' input_jars_paths=["\\$android_sdk/optional/org.apache.http.legacy.jar"]\n') sb.append(' input_jars_paths=["\\$android_sdk/optional/org.apache.http.legacy.jar"]\n')
sb.append(' bytecode_rewriter_target = "//build/android/bytecode:fragment_activity_replacer"\n')
break break
case 'com_google_android_gms_play_services_maps': case 'com_google_android_gms_play_services_maps':
sb.append(' # Ignore the dependency to org.apache.http.legacy. See crbug.com/1084879.\n') sb.append(' # Ignore the dependency to org.apache.http.legacy. See crbug.com/1084879.\n')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment