Fix for aarch64 build errors

Change-Id: I8e52982ac7722f174e01d7911969b1d8c2dfc5ef
Signed-off-by: Chandan Padhi <c.padhi@samsung.com>

diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
index f5852b54d9c02a60d63bf790d8c3b92b5c973444..4994452dfd9a0069291d91e33d3e2017a433e663 100644 (file)
--- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
@@ -49,12 +49,12 @@
 // defined on aarch64, so don't try to include this on those platforms.
 #include <asm/ptrace-abi.h>
 #elif BUILDFLAG(IS_TIZEN)
-#if defined(__riscv)
+#if defined(__riscv) || defined(__aarch64__)
 #include <asm/ptrace.h>
 #else
 #include <asm-arm/ptrace.h>
 #endif
-#endif
+#endif  // BUILDFLAG(IS_TIZEN)
 
 #if BUILDFLAG(IS_ANDROID)
 

diff --git a/third_party/libvpx/BUILD.gn b/third_party/libvpx/BUILD.gn
index 8b597bb56bd14add583bb9d79939a3687004d61f..90cf3fe0c30558ccf8e6f161bb46b20477815276 100644 (file)
--- a/third_party/libvpx/BUILD.gn
+++ b/third_party/libvpx/BUILD.gn
@@ -598,7 +598,7 @@ static_library("libvpx") {
       cpu_arch_full == "arm-neon-cpu-detect" || current_cpu == "arm64") {
     deps += [ ":libvpx_intrinsics_neon" ]
   }
-  if (current_cpu == "arm64" && is_clang) {
+  if (current_cpu == "arm64") {
     deps += [ ":libvpx_intrinsics_neon_dotprod" ]
     deps += [ ":libvpx_intrinsics_neon_i8mm" ]
     if (!is_win) {