leave off options.h include for Android builds

pull/2/merge
Chris Conlon 2015-04-06 17:12:50 -06:00
parent 786a7d3527
commit fa454e4d15
12 changed files with 48 additions and 12 deletions

View File

@ -1,7 +1,10 @@
#include <com_wolfssl_wolfcrypt_Aes.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/options.h>
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/wolfcrypt/aes.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */

View File

@ -2,7 +2,10 @@
#include <wolfcrypt_jni_NativeStruct.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/options.h>
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/wolfcrypt/asn_public.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */

View File

@ -1,7 +1,10 @@
#include <com_wolfssl_wolfcrypt_Des3.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/options.h>
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/wolfcrypt/des3.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */

View File

@ -1,7 +1,10 @@
#include <com_wolfssl_wolfcrypt_Dh.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/options.h>
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/wolfcrypt/dh.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */

View File

@ -1,7 +1,10 @@
#include <com_wolfssl_wolfcrypt_Ecc.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/options.h>
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/wolfcrypt/ecc.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */

View File

@ -2,7 +2,10 @@
#include <com_wolfssl_wolfcrypt_Fips.h>
#include <wolfcrypt_jni_NativeStruct.h>
#include <wolfssl/options.h>
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/wolfcrypt/error-crypt.h>
#include <wolfssl/wolfcrypt/fips_test.h>
#include <wolfssl/wolfcrypt/aes.h>

View File

@ -1,7 +1,10 @@
#include <com_wolfssl_wolfcrypt_Hmac.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/options.h>
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/wolfcrypt/hmac.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */

View File

@ -1,7 +1,10 @@
#include <com_wolfssl_wolfcrypt_Md5.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/options.h>
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/wolfcrypt/md5.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */

View File

@ -1,7 +1,10 @@
#include <com_wolfssl_wolfcrypt_NativeStruct.h>
#include <wolfcrypt_jni_NativeStruct.h>
#include <wolfssl/options.h>
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/wolfcrypt/types.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */

View File

@ -1,7 +1,10 @@
#include <com_wolfssl_wolfcrypt_Rng.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/options.h>
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/wolfcrypt/random.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */

View File

@ -2,7 +2,10 @@
#include <wolfcrypt_jni_NativeStruct.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/options.h>
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/wolfcrypt/rsa.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */

View File

@ -1,7 +1,10 @@
#include <com_wolfssl_wolfcrypt_Sha.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/options.h>
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/wolfcrypt/sha.h>
#include <wolfssl/wolfcrypt/sha256.h>
#include <wolfssl/wolfcrypt/sha512.h>