From 4592dbc61367ac8b7beacf32b37c76aecc53078b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mois=C3=A9s=20Guimar=C3=A3es?= <moises@wolfssl.com>
Date: Thu, 24 Mar 2016 22:56:05 -0300
Subject: [PATCH] revert __ANDROID__ check removal.

---
 jni/jni_aes.c           | 4 +++-
 jni/jni_asn.c           | 4 +++-
 jni/jni_des3.c          | 4 +++-
 jni/jni_dh.c            | 4 +++-
 jni/jni_ecc.c           | 4 +++-
 jni/jni_error.c         | 4 +++-
 jni/jni_fips.c          | 4 +++-
 jni/jni_hmac.c          | 4 +++-
 jni/jni_logging.c       | 4 +++-
 jni/jni_md5.c           | 4 +++-
 jni/jni_native_struct.c | 4 +++-
 jni/jni_rng.c           | 4 +++-
 jni/jni_rsa.c           | 4 +++-
 jni/jni_sha.c           | 4 +++-
 14 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/jni/jni_aes.c b/jni/jni_aes.c
index 27a97ef..de0d2c7 100644
--- 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>
diff --git a/jni/jni_asn.c b/jni/jni_asn.c
index 2a55aea..6b82eaf 100644
--- 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>
 
diff --git a/jni/jni_des3.c b/jni/jni_des3.c
index f3cb211..1fa4d95 100644
--- 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>
diff --git a/jni/jni_dh.c b/jni/jni_dh.c
index c655f7f..8f5e3eb 100644
--- 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>
diff --git a/jni/jni_ecc.c b/jni/jni_ecc.c
index 00b846c..b1870eb 100644
--- 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>
diff --git a/jni/jni_error.c b/jni/jni_error.c
index dda8a4d..c243c1c 100644
--- 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>
diff --git a/jni/jni_fips.c b/jni/jni_fips.c
index 3e40b97..a736e87 100644
--- 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>
diff --git a/jni/jni_hmac.c b/jni/jni_hmac.c
index 42b65ab..5ef4ddd 100644
--- 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>
diff --git a/jni/jni_logging.c b/jni/jni_logging.c
index 0af615f..b8d729a 100644
--- 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>
diff --git a/jni/jni_md5.c b/jni/jni_md5.c
index 89c8fdf..865643e 100644
--- 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>
diff --git a/jni/jni_native_struct.c b/jni/jni_native_struct.c
index 73342ff..b67a388 100644
--- 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>
diff --git a/jni/jni_rng.c b/jni/jni_rng.c
index 786abb0..ce01ae2 100644
--- 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>
diff --git a/jni/jni_rsa.c b/jni/jni_rsa.c
index 195501d..9864842 100644
--- 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>
 
diff --git a/jni/jni_sha.c b/jni/jni_sha.c
index d6b14ff..ef09dee 100644
--- 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>