SDL: Added OpenSSL Git as a submodule, added source archives to libiconv/libicu repo
This commit is contained in:
5
.gitmodules
vendored
5
.gitmodules
vendored
@@ -49,7 +49,6 @@
|
||||
[submodule "project/jni/application/openttd/src"]
|
||||
path = project/jni/application/openttd/src
|
||||
url = git@github.com:pelya/openttd-android.git
|
||||
branch = master
|
||||
[submodule "project/jni/application/xserver-debian/xserver"]
|
||||
path = project/jni/application/xserver-debian/xserver
|
||||
url = git@github.com:pelya/xserver.git
|
||||
@@ -65,3 +64,7 @@
|
||||
[submodule "project/jni/application/vice/vice"]
|
||||
path = project/jni/application/vice/vice
|
||||
url = git@github.com:lubomyr/vice-2.4.git
|
||||
[submodule "project/jni/openssl/openssl/jni"]
|
||||
path = project/jni/openssl/openssl/jni
|
||||
url = https://android.googlesource.com/platform/external/openssl
|
||||
branch = lollipop-mr1-dev
|
||||
|
||||
Submodule project/jni/iconv/src updated: a63fa87d2e...a6a6531070
1
project/jni/openssl/.gitignore
vendored
1
project/jni/openssl/.gitignore
vendored
@@ -1 +0,0 @@
|
||||
openssl/
|
||||
@@ -2,13 +2,11 @@
|
||||
|
||||
ARCH_LIST="armeabi armeabi-v7a arm64-v8a x86 mips x86_64"
|
||||
|
||||
[ -e openssl ] || {
|
||||
mkdir -p openssl
|
||||
git clone --depth=1 -b lollipop-mr1-dev https://android.googlesource.com/platform/external/openssl openssl/jni || exit 1
|
||||
} || exit 1
|
||||
#sed -i 's/BUILD_HOST_SHARED_LIBRARY/BUILD_SHARED_LIBRARY/g' openssl/jni/*.mk
|
||||
#sed -i 's/BUILD_HOST_STATIC_LIBRARY/BUILD_STATIC_LIBRARY/g' openssl/jni/*.mk
|
||||
sed -i 's@external/openssl/@jni/@g' openssl/jni/*.mk
|
||||
#sed -i 's@external/openssl/@jni/@g' openssl/jni/*.mk
|
||||
mkdir -p openssl/external
|
||||
ln -s ../jni openssl/external/openssl
|
||||
cp -f Apps.mk openssl/jni/Apps.mk
|
||||
touch openssl/jni/Empty.mk
|
||||
echo APP_MODULES := libcrypto_static_ndk libssl_static_ndk > openssl/jni/Application.mk
|
||||
|
||||
1
project/jni/openssl/openssl/jni
Submodule
1
project/jni/openssl/openssl/jni
Submodule
Submodule project/jni/openssl/openssl/jni added at 8795587768
Reference in New Issue
Block a user