From 3deb24b7dee3d3aee4b5c2a0bc502237b065bcd1 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sat, 5 May 2018 21:46:17 -0400 Subject: [PATCH] Fix Android build after renaming defines for CMake This change should have occurred during commits 188e0df65008 and 5422f0c13a57. --- TestScripts/setenv-android-gcc.sh | 2 +- setenv-android-gcc.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TestScripts/setenv-android-gcc.sh b/TestScripts/setenv-android-gcc.sh index 32973cf0..d49f2000 100755 --- a/TestScripts/setenv-android-gcc.sh +++ b/TestScripts/setenv-android-gcc.sh @@ -174,7 +174,7 @@ case "$THE_ARCH" in TOOLCHAIN_NAME="x86_64-linux-android" AOSP_ABI="x86_64" AOSP_ARCH="arch-x86_64" - AOSP_FLAGS="-march=x86-64 -msse4.2 -mpopcnt -mtune=intel -DCRYPTOPP_DISABLE_CLMUL -DCRYPTOPP_DISABLE_AES -DCRYPTOPP_DISABLE_SHA -funwind-tables -fexceptions -frtti" + AOSP_FLAGS="-march=x86-64 -msse4.2 -mpopcnt -mtune=intel -DCRYPTOPP_DISABLE_CLMUL -DCRYPTOPP_DISABLE_AESNI -DCRYPTOPP_DISABLE_SHANI -funwind-tables -fexceptions -frtti" ;; *) echo "ERROR: Unknown architecture $1" diff --git a/setenv-android-gcc.sh b/setenv-android-gcc.sh index 32973cf0..d49f2000 100755 --- a/setenv-android-gcc.sh +++ b/setenv-android-gcc.sh @@ -174,7 +174,7 @@ case "$THE_ARCH" in TOOLCHAIN_NAME="x86_64-linux-android" AOSP_ABI="x86_64" AOSP_ARCH="arch-x86_64" - AOSP_FLAGS="-march=x86-64 -msse4.2 -mpopcnt -mtune=intel -DCRYPTOPP_DISABLE_CLMUL -DCRYPTOPP_DISABLE_AES -DCRYPTOPP_DISABLE_SHA -funwind-tables -fexceptions -frtti" + AOSP_FLAGS="-march=x86-64 -msse4.2 -mpopcnt -mtune=intel -DCRYPTOPP_DISABLE_CLMUL -DCRYPTOPP_DISABLE_AESNI -DCRYPTOPP_DISABLE_SHANI -funwind-tables -fexceptions -frtti" ;; *) echo "ERROR: Unknown architecture $1"