From 33a48afd178d4e59e457567b6460bb01aada907b Mon Sep 17 00:00:00 2001
From: Ilya Mizus <bigfatbrowncat@gmail.com>
Date: Wed, 5 Mar 2014 01:33:41 +0400
Subject: [PATCH] NativeCrypto is back for non-Windows platforms

---
 makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/makefile b/makefile
index 78fd3d7462..efc08f9e0a 100755
--- a/makefile
+++ b/makefile
@@ -190,10 +190,9 @@ ifneq ($(android),)
 		$(libnativehelper-native)/toStringArray.cpp
 
 	crypto-native := $(android)/libcore/crypto/src/main/native
-	crypto-cpps := 
-	#$(crypto-native)/org_conscrypt_NativeCrypto.cpp
 
 	ifeq ($(platform),windows)
+		crypto-cpps := 
 		android-cflags += -D__STDC_CONSTANT_MACROS
 		blacklist = $(luni-native)/java_io_Console.cpp \
 			$(luni-native)/java_lang_ProcessManager.cpp \
@@ -206,6 +205,7 @@ ifneq ($(android),)
 			$(android)/external/icu4c/lib/sicudt.a
 		platform-lflags := -lgdi32 -lshell32
 	else
+		crypto-cpps := $(crypto-native)/org_conscrypt_NativeCrypto.cpp
 		android-cflags += -fPIC -DHAVE_SYS_UIO_H
 		icu-libs := $(android)/external/icu4c/lib/libicui18n.a \
 			$(android)/external/icu4c/lib/libicuuc.a \