pEp.foundation
/
pEpJNIAdapter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

JNI-81 Clean Android build: Move all non-git-hosted libs to common Makefile.

JNI-88
Hussein Kasem 6 years ago
parent
96ad4681d1
commit
dc6ee73fdf
4 changed files with 42 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      android/external/Makefile
  2. 31
      android/external/arm64-v8a/Makefile
  3. 31
      android/external/armeabi-v7a/Makefile
  4. 21
      android/external/common/Makefile

7
android/external/Makefile
View File

@ -19,7 +19,7 @@ ifdef BUILD_CONFIG
$(info ================================================) $(info ================================================)
endif endif
.PHONY: all build clean .PHONY: all build clean clean-all
all: build all: build
@ -31,6 +31,11 @@ clean:
$(MAKE) -C armeabi-v7a clean $(MAKE) -C armeabi-v7a clean
$(MAKE) -C arm64-v8a clean $(MAKE) -C arm64-v8a clean
clean-all:
$(MAKE) -C common clean
$(MAKE) -C armeabi-v7a clean-all
$(MAKE) -C arm64-v8a clean-all
libiconv-1.15.tar.gz: libiconv-1.15.tar.gz:
$(MAKE) -C common $(MAKE) -C common

31
android/external/arm64-v8a/Makefile
View File

@ -139,7 +139,7 @@ libetpan-cleanzip:
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# uuid # uuid
uuid.src.stamp: ossp-uuid_1.6.2.orig.tar.gz uuid.src.stamp: ../ossp-uuid_1.6.2.orig.tar.gz
tar xvfz ../ossp-uuid_1.6.2.orig.tar.gz tar xvfz ../ossp-uuid_1.6.2.orig.tar.gz
mv uuid-1.6.2 uuid mv uuid-1.6.2 uuid
touch $@ touch $@
@ -192,13 +192,8 @@ sequoia-deps-build: gmp-install nettle-install openssl-install
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# OpenSSL # OpenSSL
openssl-$(OPENSSL_VERSION).tar.gz: openssl.src.stamp: ../openssl-$(OPENSSL_VERSION).tar.gz
wget -nc https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz tar xvf ../openssl-$(OPENSSL_VERSION).tar.gz
md5sum -c ../openssl-$(OPENSSL_VERSION).tar.gz.md5
touch $@
openssl.src.stamp: openssl-$(OPENSSL_VERSION).tar.gz
tar xvf openssl-$(OPENSSL_VERSION).tar.gz
mv openssl-$(OPENSSL_VERSION) openssl mv openssl-$(OPENSSL_VERSION) openssl
touch $@ touch $@
@ -232,13 +227,8 @@ openssl-install: $(LOCAL)/lib/libssl.so
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# GMP # GMP
gmp-$(GMP_VERSION).tar.bz2: gmp.src.stamp: ../gmp-$(GMP_VERSION).tar.bz2
wget -nc https://gmplib.org/download/gmp/gmp-$(GMP_VERSION).tar.bz2 tar xvf ../gmp-$(GMP_VERSION).tar.bz2
md5sum -c ../gmp-$(GMP_VERSION).tar.bz2.md5
touch $@
gmp.src.stamp: gmp-$(GMP_VERSION).tar.bz2
tar xvf gmp-$(GMP_VERSION).tar.bz2
mv gmp-$(GMP_VERSION) gmp mv gmp-$(GMP_VERSION) gmp
touch $@ touch $@
@ -275,13 +265,8 @@ gmp-install: $(LOCAL)/lib/libgmp.so
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# NETTLE # NETTLE
nettle-$(NETTLE_VERSION).tar.gz: $(LOCAL)/lib/libgmp.so nettle.src.stamp: ../nettle-$(NETTLE_VERSION).tar.gz $(LOCAL)/lib/libgmp.so
wget -nc https://ftp.gnu.org/gnu/nettle/nettle-$(NETTLE_VERSION).tar.gz tar xvf ../nettle-$(NETTLE_VERSION).tar.gz
md5sum -c ../nettle-$(NETTLE_VERSION).tar.gz.md5
touch $@
nettle.src.stamp: nettle-$(NETTLE_VERSION).tar.gz
tar xvf nettle-$(NETTLE_VERSION).tar.gz
mv nettle-$(NETTLE_VERSION) nettle mv nettle-$(NETTLE_VERSION) nettle
touch $@ touch $@
@ -422,7 +407,7 @@ clean-assets:
rm -rf $(ASSETS) rm -rf $(ASSETS)
clean-install: clean-install:
rm -rf $(DESTDIR)/data rm -rf $(LOCAL)
clean: $(EXTERNAL_SRCS_CLEAN) clean-assets clean-install libetpan-cleanzip clean: $(EXTERNAL_SRCS_CLEAN) clean-assets clean-install libetpan-cleanzip

31
android/external/armeabi-v7a/Makefile
View File

@ -145,7 +145,7 @@ libetpan-cleanzip:
# using released package from debian. official ftp wasn't available today # using released package from debian. official ftp wasn't available today
uuid.src.stamp: ossp-uuid_1.6.2.orig.tar.gz uuid.src.stamp: ../ossp-uuid_1.6.2.orig.tar.gz
tar xvfz ../ossp-uuid_1.6.2.orig.tar.gz tar xvfz ../ossp-uuid_1.6.2.orig.tar.gz
mv uuid-1.6.2 uuid mv uuid-1.6.2 uuid
touch $@ touch $@
@ -201,13 +201,8 @@ sequoia-deps-build: gmp-install nettle-install openssl-install
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# OpenSSL # OpenSSL
openssl-$(OPENSSL_VERSION).tar.gz: openssl.src.stamp: ../openssl-$(OPENSSL_VERSION).tar.gz
wget -nc https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz tar xvf ../openssl-$(OPENSSL_VERSION).tar.gz
md5sum -c ../openssl-$(OPENSSL_VERSION).tar.gz.md5
touch $@
openssl.src.stamp: openssl-$(OPENSSL_VERSION).tar.gz
tar xvf openssl-$(OPENSSL_VERSION).tar.gz
mv openssl-$(OPENSSL_VERSION) openssl mv openssl-$(OPENSSL_VERSION) openssl
touch $@ touch $@
@ -242,13 +237,8 @@ openssl-install: $(LOCAL)/lib/libssl.so
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# GMP # GMP
gmp-$(GMP_VERSION).tar.bz2: gmp.src.stamp: ../gmp-$(GMP_VERSION).tar.bz2
wget -nc https://gmplib.org/download/gmp/gmp-$(GMP_VERSION).tar.bz2 tar xvf ../gmp-$(GMP_VERSION).tar.bz2
md5sum -c ../gmp-$(GMP_VERSION).tar.bz2.md5
touch $@
gmp.src.stamp: gmp-$(GMP_VERSION).tar.bz2
tar xvf gmp-$(GMP_VERSION).tar.bz2
mv gmp-$(GMP_VERSION) gmp mv gmp-$(GMP_VERSION) gmp
touch $@ touch $@
@ -282,13 +272,8 @@ gmp-install: $(LOCAL)/lib/libgmp.so
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# NETTLE # NETTLE
nettle-$(NETTLE_VERSION).tar.gz: $(LOCAL)/lib/libgmp.so nettle.src.stamp: ../nettle-$(NETTLE_VERSION).tar.gz $(LOCAL)/lib/libgmp.so
wget -nc https://ftp.gnu.org/gnu/nettle/nettle-$(NETTLE_VERSION).tar.gz tar xvf ../nettle-$(NETTLE_VERSION).tar.gz
md5sum -c ../nettle-$(NETTLE_VERSION).tar.gz.md5
touch $@
nettle.src.stamp: nettle-$(NETTLE_VERSION).tar.gz
tar xvf nettle-$(NETTLE_VERSION).tar.gz
mv nettle-$(NETTLE_VERSION) nettle mv nettle-$(NETTLE_VERSION) nettle
touch $@ touch $@
@ -428,7 +413,7 @@ clean-assets:
rm -rf $(ASSETS) rm -rf $(ASSETS)
clean-install: clean-install:
rm -rf $(DESTDIR)/data rm -rf $(LOCAL)
clean: $(EXTERNAL_SRCS_CLEAN) clean-assets clean-install libetpan-cleanzip clean: $(EXTERNAL_SRCS_CLEAN) clean-assets clean-install libetpan-cleanzip

21
android/external/common/Makefile
View File

@ -13,12 +13,14 @@ include ../Makefile.conf
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# Build parameters # Build parameters
all: download-iconv download-uuid #build-etpan download sequoia all: download-iconv download-uuid download-sequoia-deps #build-etpan download sequoia
download-iconv: ../libiconv-1.15.tar.gz download-iconv: ../libiconv-1.15.tar.gz
download-uuid: ../ossp-uuid_1.6.2.orig.tar.gz download-uuid: ../ossp-uuid_1.6.2.orig.tar.gz
download-sequoia-deps: ../openssl-$(OPENSSL_VERSION).tar.gz ../gmp-$(GMP_VERSION).tar.bz2 ../nettle-$(NETTLE_VERSION).tar.gz
# Download source and patch it # Download source and patch it
../libiconv-1.15.tar.gz: ../libiconv-1.15.tar.gz:
wget https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz -P ../ wget https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz -P ../
@ -27,8 +29,25 @@ download-uuid: ../ossp-uuid_1.6.2.orig.tar.gz
wget http://http.debian.net/debian/pool/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz -P ../ wget http://http.debian.net/debian/pool/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz -P ../
cd .. && md5sum -c ossp-uuid_1.6.2.orig.tar.gz.md5 cd .. && md5sum -c ossp-uuid_1.6.2.orig.tar.gz.md5
../openssl-$(OPENSSL_VERSION).tar.gz:
wget -nc https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz -P ../
cd .. && md5sum -c openssl-$(OPENSSL_VERSION).tar.gz.md5
../gmp-$(GMP_VERSION).tar.bz2:
wget -nc https://gmplib.org/download/gmp/gmp-$(GMP_VERSION).tar.bz2 -P ../
cd .. && md5sum -c gmp-$(GMP_VERSION).tar.bz2.md5
../nettle-$(NETTLE_VERSION).tar.gz:
wget -nc https://ftp.gnu.org/gnu/nettle/nettle-$(NETTLE_VERSION).tar.gz -P ../
cd .. && md5sum -c nettle-$(NETTLE_VERSION).tar.gz.md5
clean: clean:
rm -rf ../libiconv-1.15.tar.gz rm -rf ../libiconv-1.15.tar.gz
rm -rf ../ossp-uuid_1.6.2.orig.tar.gz rm -rf ../ossp-uuid_1.6.2.orig.tar.gz
rm -rf ../openssl-$(OPENSSL_VERSION).tar.gz
rm -rf ../gmp-$(GMP_VERSION).tar.bz2
rm -rf ../nettle-$(NETTLE_VERSION).tar.gz
.PHONY: clean download-iconv download-uuid .PHONY: clean download-iconv download-uuid
Write Preview
Loading…
Cancel
Save