From 7c1413a49658038c5723e2c620fadc4afb044bb6 Mon Sep 17 00:00:00 2001
From: Pushen Wang <wangpush@amazon.com>
Date: Sat, 3 Apr 2021 00:41:37 +0000
Subject: [PATCH] Define CMAKE_SYSTEM_PROCESSOR in Toolchain.cmake for Android
 build.

---
 android-arm/Toolchain.cmake    | 1 +
 android-arm64/Toolchain.cmake  | 1 +
 android-x86/Toolchain.cmake    | 1 +
 android-x86_64/Toolchain.cmake | 1 +
 4 files changed, 4 insertions(+)

diff --git a/android-arm/Toolchain.cmake b/android-arm/Toolchain.cmake
index eb29934..b9d6b60 100644
--- a/android-arm/Toolchain.cmake
+++ b/android-arm/Toolchain.cmake
@@ -1,5 +1,6 @@
 set(CMAKE_SYSTEM_NAME Android)
 set(CMAKE_SYSTEM_VERSION 1)
+set(CMAKE_SYSTEM_PROCESSOR armv7-a)
 set(CMAKE_ANDROID_ARCH_ABI armeabi-v7a)
 
 set(cross_triple arm-linux-androideabi)
diff --git a/android-arm64/Toolchain.cmake b/android-arm64/Toolchain.cmake
index 0a55858..d91805e 100644
--- a/android-arm64/Toolchain.cmake
+++ b/android-arm64/Toolchain.cmake
@@ -1,5 +1,6 @@
 set(CMAKE_SYSTEM_NAME Android)
 set(CMAKE_SYSTEM_VERSION 1)
+set(CMAKE_SYSTEM_PROCESSOR aarch64)
 set(CMAKE_ANDROID_ARCH_ABI arm64-v8a)
 
 set(cross_triple aarch64-linux-android)
diff --git a/android-x86/Toolchain.cmake b/android-x86/Toolchain.cmake
index fd84988..625ca53 100644
--- a/android-x86/Toolchain.cmake
+++ b/android-x86/Toolchain.cmake
@@ -1,5 +1,6 @@
 set(CMAKE_SYSTEM_NAME Android)
 set(CMAKE_SYSTEM_VERSION 1)
+set(CMAKE_SYSTEM_PROCESSOR i686)
 set(CMAKE_ANDROID_ARCH_ABI x86)
 
 set(cross_triple i686-linux-android)
diff --git a/android-x86_64/Toolchain.cmake b/android-x86_64/Toolchain.cmake
index 0c443bc..bcf384f 100644
--- a/android-x86_64/Toolchain.cmake
+++ b/android-x86_64/Toolchain.cmake
@@ -1,5 +1,6 @@
 set(CMAKE_SYSTEM_NAME Android)
 set(CMAKE_SYSTEM_VERSION 1)
+set(CMAKE_SYSTEM_PROCESSOR x86_64)
 set(CMAKE_ANDROID_ARCH_ABI x86_64)
 
 set(cross_triple x86_64-linux-android)