mirror of
https://github.com/corda/corda.git
synced 2025-03-18 01:55:19 +00:00
Reversed applying patches to android libcore
This commit is contained in:
parent
f70ec251ce
commit
11959d8ab3
@ -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();
|
12
makefile
12
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
|
||||
|
Loading…
x
Reference in New Issue
Block a user