Make top level dependency to nacl_helper on ARM64 Chrome OS build.
This is the follow up CL of crrev.com/c/3932419.
With this CL, nacl_helper is a top level dependency on ARM64 Chrome OS.
Note that, this CL does not do it for ARM64 Linux yet, which
will be done soon in a following CL.
BUG=1299021, 1365963
TEST=Built.
Change-Id: I6d934c843d57ebbd0019b3022f3aa392b01bd857
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3971457
Reviewed-by: Takuto Ikuta <[email protected]>
Commit-Queue: Hidehiko Abe <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1062647}
diff --git a/BUILD.gn b/BUILD.gn
index 6aef468..6ae237ee 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -582,10 +582,12 @@
# TODO(https://crbug.com/1299021): These dependencies might be
# redundant given that we were able to disable them, apparently without
# negative consequences, for the ARM32-NaCl-on-ARM64 case.
- if (enable_nacl && target_cpu != "arm64") {
- deps += [ "//components/nacl/loader:nacl_loader_unittests" ]
+ if (enable_nacl) {
+ if (target_cpu != "arm64") {
+ deps += [ "//components/nacl/loader:nacl_loader_unittests" ]
+ }
- if (is_linux || is_chromeos) {
+ if ((target_cpu != "arm64" && is_linux) || is_chromeos) {
# TODO(dpranke): Figure out what platforms should actually have this.
deps += [ "//components/nacl/loader:nacl_helper" ]
}
