From 11959d8ab32e3953de18ec0954b326523433c990 Mon Sep 17 00:00:00 2001
From: Vasily Litvinov <vasslitvinov@pisem.net>
Date: Mon, 7 Apr 2014 23:12:13 +0400
Subject: [PATCH] Reversed applying patches to android libcore

---
 android-patches.diff | 12 ------------
 makefile             | 12 ------------
 2 files changed, 24 deletions(-)
 delete mode 100644 android-patches.diff

diff --git a/android-patches.diff b/android-patches.diff
deleted file mode 100644
index cec06d5732..0000000000
--- a/android-patches.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru android-src.old/org/conscrypt/NativeCrypto.java android-src/org/conscrypt/NativeCrypto.java
---- android-src.old/org/conscrypt/NativeCrypto.java	2014-03-30 23:53:27 +0400
-+++ android-src/org/conscrypt/NativeCrypto.java	2014-03-30 23:53:39 +0400
-@@ -51,7 +51,7 @@
-          * name.
-          */
-         if (!"com.android.org.conscrypt".equals(NativeCrypto.class.getPackage().getName())) {
--            System.loadLibrary("conscrypt_jni");
-+            //System.loadLibrary("conscrypt_jni");
-         }
- 
-         clinit();
diff --git a/makefile b/makefile
index 4c2b291fa9..ee39168bba 100755
--- a/makefile
+++ b/makefile
@@ -1579,24 +1579,12 @@ $(build)/android.dep: $(luni-javas) $(libdvm-javas) $(crypto-javas) \
 	@echo "compiling luni classes"
 	@mkdir -p $(classpath-build)
 	@mkdir -p $(build)/android
-	@rm -rf $(build)/android-src
 	@mkdir -p $(build)/android-src/external/fdlibm
 	@mkdir -p $(build)/android-src/libexpat
 	cp $(android)/external/fdlibm/fdlibm.h $(build)/android-src/external/fdlibm/
 	cp $(android)/external/expat/lib/expat*.h $(build)/android-src/libexpat/
 	cp -a $(luni-java)/* $(libdvm-java)/* $(crypto-java)/* $(dalvik-java)/* \
 		$(xml-java)/* $(build)/android-src/
-
-ifeq ($(platform),windows)
-	# convert line endings... otherwise patches are difficult
-	# do that by first "dry-running" the patch to determine which files are patched
-	patch -d $(build)/android-src -p1 --dry-run -f < android-patches.diff | \
-		grep -E '^patching file ' | sed -e 's/^patching file \(.*\)/\1/g' | \
-		( cd $(build)/android-src && xargs dos2unix )
-endif
-
-	# now patch the files
-	( cd $(build)/android-src && patch -p1 ) < android-patches.diff
 	find $(build)/android-src -name '*.java' > $(build)/android.txt
 	$(javac) -Xmaxerrs 1000 -d $(build)/android -sourcepath $(luni-java) \
 		@$(build)/android.txt