Revert "siso: Re-enable remote proguard step along with remote trace_references step"
This reverts commit bd80b06db1
.
Reason for revert: The issue still occurs.
https://ci.chromium.org/ui/p/chromium/builders/ci/android-11-x86-rel/16925/overview
Original change's description:
> siso: Re-enable remote proguard step along with remote trace_references step
>
> This CL enables remote proguard step + enables remote trace references step. They used to run in the same script, and separating them to two
> different steps may cause incremental build issue.
>
> Bug: 398058215
> Change-Id: Iaaec645e790340083a561499856a8c8faeedacd8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6356469
> Reviewed-by: Fumitoshi Ukai <ukai@google.com>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Commit-Queue: Junji Watanabe <jwata@google.com>
> Cr-Commit-Position: refs/heads/main@{#1433327}
Bug: 398058215
Change-Id: I13c07d00da2f810aa999b86127497cceb78e230b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6365154
Commit-Queue: Junji Watanabe <jwata@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1433960}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
caea812233
commit
783d8fb43b
@ -243,26 +243,8 @@ def __step_config(ctx, step_config):
|
||||
"*.sql",
|
||||
],
|
||||
"canonicalize_dir": True,
|
||||
"remote": remote_run,
|
||||
"platform_ref": "large",
|
||||
"timeout": "10m",
|
||||
},
|
||||
{
|
||||
"name": "android/trace_references",
|
||||
"command_prefix": "python3 ../../build/android/gyp/tracereferences.py",
|
||||
"handler": "android_trace_references",
|
||||
"exclude_input_patterns": [
|
||||
"*.a",
|
||||
"*.cc",
|
||||
"*.h",
|
||||
"*.inc",
|
||||
"*.info",
|
||||
"*.o",
|
||||
"*.pak",
|
||||
"*.sql",
|
||||
],
|
||||
"canonicalize_dir": True,
|
||||
"remote": remote_run,
|
||||
# Speculatively disabling for https://crbug.com/398058215
|
||||
"remote": False,
|
||||
"platform_ref": "large",
|
||||
"timeout": "10m",
|
||||
},
|
||||
@ -436,55 +418,6 @@ def __android_proguard_handler(ctx, cmd):
|
||||
outputs = cmd.outputs + outputs,
|
||||
)
|
||||
|
||||
def __android_trace_references_handler(ctx, cmd):
|
||||
# Sample command:
|
||||
# python3 ../../build/android/gyp/tracereferences.py \
|
||||
# --depfile gen/chrome/android/monochrome_public_bundle__dex.d \
|
||||
# --tracerefs-json gen/chrome/android/monochrome_public_bundle__dex.tracerefs.json \
|
||||
# --stamp obj/chrome/android/monochrome_public_bundle__dex.tracereferences.stamp --warnings-as-errors
|
||||
# Sample tracerefs.json:
|
||||
# {
|
||||
# "r8jar": "../../third_party/r8/cipd/lib/r8.jar",
|
||||
# "libs": [
|
||||
# "../../clank/third_party/android_system_sdk/src/android_system.jar",
|
||||
# "../../third_party/android_sdk/xr_extensions/com.android.extensions.xr.jar",
|
||||
# "obj/third_party/android_sdk/window_extensions/androidx_window_extensions_java.javac.jar"
|
||||
# ],
|
||||
# "jobs": [
|
||||
# {
|
||||
# "name": "",
|
||||
# "jars": [
|
||||
# "obj/chrome/android/monochrome_public_bundle__base_bundle_module/monochrome_public_bundle__base_bundle_module.r8dex.jar",
|
||||
# "obj/chrome/android/monochrome_public_bundle__chrome_bundle_module/monochrome_public_bundle__chrome_bundle_module.r8dex.jar",
|
||||
# "obj/chrome/android/monochrome_public_bundle__dev_ui_bundle_module/monochrome_public_bundle__dev_ui_bundle_module.r8dex.jar",
|
||||
# "obj/chrome/android/monochrome_public_bundle__stack_unwinder_bundle_module/monochrome_public_bundle__stack_unwinder_bundle_module.r8dex.jar",
|
||||
# "obj/chrome/android/monochrome_public_bundle__test_dummy_bundle_module/monochrome_public_bundle__test_dummy_bundle_module.r8dex.jar"
|
||||
# ]
|
||||
# },
|
||||
# {
|
||||
# "name": "base",
|
||||
# "jars": [
|
||||
# "obj/chrome/android/monochrome_public_bundle__base_bundle_module/monochrome_public_bundle__base_bundle_module.r8dex.jar"
|
||||
# ]
|
||||
# }
|
||||
# ]
|
||||
# }
|
||||
inputs = []
|
||||
for i, arg in enumerate(cmd.args):
|
||||
if arg == "--tracerefs-json":
|
||||
tracerefs_json = json.decode(str(ctx.fs.read(ctx.fs.canonpath(cmd.args[i + 1]))))
|
||||
break
|
||||
|
||||
for lib in tracerefs_json.get("libs", []):
|
||||
inputs.append(ctx.fs.canonpath(lib))
|
||||
for job in tracerefs_json.get("jobs", []):
|
||||
for jar in job.get("jars", ""):
|
||||
inputs.append(ctx.fs.canonpath(jar))
|
||||
|
||||
ctx.actions.fix(
|
||||
inputs = cmd.inputs + inputs,
|
||||
)
|
||||
|
||||
def __android_turbine_handler(ctx, cmd):
|
||||
inputs = []
|
||||
for i, arg in enumerate(cmd.args):
|
||||
@ -557,7 +490,6 @@ __handlers = {
|
||||
"android_compile_resources": __android_compile_resources_handler,
|
||||
"android_dex": __android_dex_handler,
|
||||
"android_proguard": __android_proguard_handler,
|
||||
"android_trace_references": __android_trace_references_handler,
|
||||
"android_turbine": __android_turbine_handler,
|
||||
"android_write_build_config": __android_write_build_config_handler,
|
||||
}
|
||||
|
Reference in New Issue
Block a user