From 7f826678679c7db535b932d38ad65181a7d00be4 Mon Sep 17 00:00:00 2001 From: Derek Xu Date: Fri, 25 Aug 2023 16:02:28 +0000 Subject: [PATCH] [SDK] Remove conditional logic guarding generation of dds and dartdev snapshots on ARM The `sdk:copy_full_sdk_snapshots` target is dependent on `utils/dartdev:dartdev` and `utils/dds:dds`, so these targets have been getting built anyways when building the SDK. TEST=Confirmed that `./tools/build.py -mdebug -aarm_x64 --os=android create_sdk` does not crash. Fixes: https://github.com/dart-lang/sdk/issues/41776 Change-Id: I356218e542313f393ff2ea812d761ab8868955d8 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/322520 Reviewed-by: Ben Konyi Commit-Queue: Derek Xu --- BUILD.gn | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 932936349b7..d3de3f43130 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -48,18 +48,11 @@ group("runtime") { "runtime/bin:process_test", "runtime/bin:run_vm_tests", "runtime/vm:kernel_platform_files($host_toolchain)", + "utils/dartdev:dartdev", + "utils/dds:dds", "utils/kernel-service:kernel-service", ] - # TODO(bkonyi): this dep causes a segfault on Android XARM_X64 builds. - # See issue #41776. - if (dart_target_arch != "arm") { - deps += [ - "utils/dartdev:dartdev", - "utils/dds:dds", - ] - } - # This flag is set in runtime/runtime_args.gni # The analyze_snapshot tool is only supported on 64 bit AOT builds running # under linux and android platforms