diff options
| -rw-r--r-- | Crypto-config-host.mk | 3 | ||||
| -rw-r--r-- | Crypto-config-target.mk | 3 | ||||
| -rwxr-xr-x | import_openssl.sh | 6 |
3 files changed, 12 insertions, 0 deletions
diff --git a/Crypto-config-host.mk b/Crypto-config-host.mk index eaff7bbdce..5c63e9ecd0 100644 --- a/Crypto-config-host.mk +++ b/Crypto-config-host.mk @@ -697,6 +697,9 @@ mips_exclude_files := \ crypto/bn/bn_asm.c \ +# "Temporary" hack until this can be fixed in openssl.config +x86_64_cflags += -DRC4_INT="unsigned int" + LOCAL_CFLAGS += $(common_cflags) LOCAL_C_INCLUDES += $(common_c_includes) $(local_c_includes) diff --git a/Crypto-config-target.mk b/Crypto-config-target.mk index e3b867f173..6fee75b357 100644 --- a/Crypto-config-target.mk +++ b/Crypto-config-target.mk @@ -697,6 +697,9 @@ mips_exclude_files := \ crypto/bn/bn_asm.c \ +# "Temporary" hack until this can be fixed in openssl.config +x86_64_cflags += -DRC4_INT="unsigned int" + LOCAL_CFLAGS += $(common_cflags) LOCAL_C_INCLUDES += $(common_c_includes) diff --git a/import_openssl.sh b/import_openssl.sh index f16596bc81..ea5f361d6c 100755 --- a/import_openssl.sh +++ b/import_openssl.sh @@ -450,6 +450,12 @@ LOCAL_ADDITIONAL_DEPENDENCIES += \$(LOCAL_PATH)/$(basename $output) done + if [ $prefix == "CRYPTO" ]; then + echo " +# \"Temporary\" hack until this can be fixed in openssl.config +x86_64_cflags += -DRC4_INT=\"unsigned int\"" + fi + if [ $3 == "target" ]; then echo " LOCAL_CFLAGS += \$(common_cflags) |