Fix Android arm64 release build

otherwise there are errors ``` ERROR at //brave/third_party/rust/sha2/v0_10/BUILD.gn:56:15 (//build/toolchain/android:android_clang_arm): Item not found deps -= [ "//brave/third_party/rust/cpufeatures/v0_2:lib" ] ^---------------------------------------------- You were trying to remove "//brave/third_party/rust/cpufeatures/v0_2:lib" from the list but it wasn't there. See //brave/third_party/rust/ed25519_dalek_bip32/v0_2/BUILD.gn:36:5: which caused the file to be included. "//brave/third_party/rust/sha2/v0_10:lib", ``` - at `src/brave/third_party/rust/aes/v0_8/BUILD.gn` - at `src/brave/third_party/rust/keccak/v0_1/BUILD.gn` - at `src/brave/third_party/rust/sha2/v0_10/BUILD.gn` - at `src/brave/third_party/rust/sha2/v0_9/BUILD.gn` Happens when current_cpu=arm
brave · Sep 20, 2024 · 0c6aef0 · 0c6aef0
1 parent 6c9117c
commit 0c6aef0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/third_party/rust/aes/v0_8/BUILD.gn b/third_party/rust/aes/v0_8/BUILD.gn
@@ -58,6 +58,8 @@ cargo_crate("lib") {
     deps += [ "//brave/third_party/rust/cpufeatures/v0_2:lib" ]
   }
   if (target_os == "android" && target_cpu == "arm64") {
-    deps -= [ "//brave/third_party/rust/cpufeatures/v0_2:lib" ]
+    deps_cpufeatures_excluded = filter_exclude(deps, [ "//brave/third_party/rust/cpufeatures/v0_2:lib" ])
+    deps = []
+    deps = deps_cpufeatures_excluded
   }
 }
diff --git a/third_party/rust/keccak/v0_1/BUILD.gn b/third_party/rust/keccak/v0_1/BUILD.gn
@@ -41,6 +41,8 @@ cargo_crate("lib") {
     deps += [ "//brave/third_party/rust/cpufeatures/v0_2:lib" ]
   }
   if (target_os == "android" && target_cpu == "arm64") {
-    deps -= [ "//brave/third_party/rust/cpufeatures/v0_2:lib" ]
+    deps_cpufeatures_excluded = filter_exclude(deps, [ "//brave/third_party/rust/cpufeatures/v0_2:lib" ])
+    deps = []
+    deps = deps_cpufeatures_excluded
   }
 }
diff --git a/third_party/rust/sha2/v0_10/BUILD.gn b/third_party/rust/sha2/v0_10/BUILD.gn
@@ -52,6 +52,8 @@ cargo_crate("lib") {
   }
   features = [ "std" ]
   if (target_os == "android" && target_cpu == "arm64") {
-    deps -= [ "//brave/third_party/rust/cpufeatures/v0_2:lib" ]
+    deps_cpufeatures_excluded = filter_exclude(deps, [ "//brave/third_party/rust/cpufeatures/v0_2:lib" ])
+    deps = []
+    deps = deps_cpufeatures_excluded
   }
 }
diff --git a/third_party/rust/sha2/v0_9/BUILD.gn b/third_party/rust/sha2/v0_9/BUILD.gn
@@ -51,6 +51,8 @@ cargo_crate("lib") {
   }
   features = [ "std" ]
   if (target_os == "android" && target_cpu == "arm64") {
-    deps -= [ "//brave/third_party/rust/cpufeatures/v0_2:lib" ]
+    deps_cpufeatures_excluded = filter_exclude(deps, [ "//brave/third_party/rust/cpufeatures/v0_2:lib" ])
+    deps = []
+    deps = deps_cpufeatures_excluded
   }
 }