revert __ANDROID__ check removal.

2016-03-24 22:56:05 -03:00 · 2016-03-24 22:56:05 -03:00 · 4592dbc613
parent d40171317f
commit 4592dbc613
14 changed files with 42 additions and 14 deletions
--- a/jni/jni_aes.c
+++ b/jni/jni_aes.c
@ -19,7 +19,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include <wolfssl/options.h>
+#ifndef __ANDROID__
+    #include <wolfssl/options.h>
+#endif
 #include <wolfssl/wolfcrypt/aes.h>

 #include <com_wolfssl_wolfcrypt_Aes.h>
--- a/jni/jni_asn.c
+++ b/jni/jni_asn.c
@ -19,7 +19,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include <wolfssl/options.h>
+#ifndef __ANDROID__
+    #include <wolfssl/options.h>
+#endif
 #include <wolfssl/wolfcrypt/asn_public.h>
 #include <wolfssl/wolfcrypt/error-crypt.h>

--- a/jni/jni_des3.c
+++ b/jni/jni_des3.c
@ -19,7 +19,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include <wolfssl/options.h>
+#ifndef __ANDROID__
+    #include <wolfssl/options.h>
+#endif
 #include <wolfssl/wolfcrypt/des3.h>

 #include <com_wolfssl_wolfcrypt_Des3.h>
--- a/jni/jni_dh.c
+++ b/jni/jni_dh.c
@ -19,7 +19,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include <wolfssl/options.h>
+#ifndef __ANDROID__
+    #include <wolfssl/options.h>
+#endif
 #include <wolfssl/wolfcrypt/dh.h>

 #include <com_wolfssl_wolfcrypt_Dh.h>
--- a/jni/jni_ecc.c
+++ b/jni/jni_ecc.c
@ -19,7 +19,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include <wolfssl/options.h>
+#ifndef __ANDROID__
+    #include <wolfssl/options.h>
+#endif
 #include <wolfssl/wolfcrypt/ecc.h>

 #include <com_wolfssl_wolfcrypt_Ecc.h>
--- a/jni/jni_error.c
+++ b/jni/jni_error.c
@ -19,7 +19,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include <wolfssl/options.h>
+#ifndef __ANDROID__
+    #include <wolfssl/options.h>
+#endif
 #include <wolfssl/wolfcrypt/error-crypt.h>

 #include <com_wolfssl_wolfcrypt_WolfCryptError.h>
--- a/jni/jni_fips.c
+++ b/jni/jni_fips.c
@ -21,7 +21,9 @@

 #include <stdio.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>
--- a/jni/jni_hmac.c
+++ b/jni/jni_hmac.c
@ -19,7 +19,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include <wolfssl/options.h>
+#ifndef __ANDROID__
+    #include <wolfssl/options.h>
+#endif
 #include <wolfssl/wolfcrypt/hmac.h>

 #include <com_wolfssl_wolfcrypt_Hmac.h>
--- a/jni/jni_logging.c
+++ b/jni/jni_logging.c
@ -19,7 +19,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include <wolfssl/options.h>
+#ifndef __ANDROID__
+    #include <wolfssl/options.h>
+#endif
 #include <wolfssl/wolfcrypt/logging.h>

 #include <com_wolfssl_wolfcrypt_Logging.h>
--- a/jni/jni_md5.c
+++ b/jni/jni_md5.c
@ -19,7 +19,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include <wolfssl/options.h>
+#ifndef __ANDROID__
+    #include <wolfssl/options.h>
+#endif
 #include <wolfssl/wolfcrypt/md5.h>

 #include <com_wolfssl_wolfcrypt_Md5.h>
--- a/jni/jni_native_struct.c
+++ b/jni/jni_native_struct.c
@ -19,7 +19,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include <wolfssl/options.h>
+#ifndef __ANDROID__
+    #include <wolfssl/options.h>
+#endif
 #include <wolfssl/wolfcrypt/types.h>

 #include <com_wolfssl_wolfcrypt_NativeStruct.h>
--- a/jni/jni_rng.c
+++ b/jni/jni_rng.c
@ -19,7 +19,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include <wolfssl/options.h>
+#ifndef __ANDROID__
+    #include <wolfssl/options.h>
+#endif
 #include <wolfssl/wolfcrypt/random.h>

 #include <com_wolfssl_wolfcrypt_Rng.h>
--- a/jni/jni_rsa.c
+++ b/jni/jni_rsa.c
@ -19,7 +19,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include <wolfssl/options.h>
+#ifndef __ANDROID__
+    #include <wolfssl/options.h>
+#endif
 #include <wolfssl/wolfcrypt/rsa.h>
 #include <wolfssl/wolfcrypt/error-crypt.h>

--- a/jni/jni_sha.c
+++ b/jni/jni_sha.c
@ -19,7 +19,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#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>