Skip to content

Commit 7d20ff4

Browse files
nerzhulnerzhul
authoredJul 1, 2018
Backport Android cleanup parts from #7123 (#7513)
Also resync properly the dependencies versions. Don't let the makefile handle the cleanups itself. Let gradle do it. This is one of the first steps to remove the makefile and replace it with a full gradle support
·
5.11.05.0.0
1 parent ad3d1d2 commit 7d20ff4

File tree

2 files changed

+82
-21
lines changed

2 files changed

+82
-21
lines changed
 

Diff for: ‎build/android/Makefile

+14-21
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ OGG_TIMESTAMP = $(OGG_DIR)timestamp
8888
OGG_TIMESTAMP_INT = $(ANDR_ROOT)/deps/ogg_timestamp
8989
OGG_URL_GIT = https://gitlab.com/minetest/libvorbis-libogg-android
9090

91-
IRRLICHT_REVISION = 5145
91+
IRRLICHT_REVISION = 5150
9292
IRRLICHT_DIR = $(ANDR_ROOT)/deps/irrlicht/
9393
IRRLICHT_LIB = $(IRRLICHT_DIR)lib/Android/libIrrlicht.a
9494
IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)timestamp
9595
IRRLICHT_TIMESTAMP_INT = $(ANDR_ROOT)/deps/irrlicht_timestamp
9696
IRRLICHT_URL_SVN = https://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@$(IRRLICHT_REVISION)
9797

98-
OPENSSL_VERSION = 1.0.2k
98+
OPENSSL_VERSION = 1.0.2n
9999
OPENSSL_BASEDIR = openssl-$(OPENSSL_VERSION)
100100
OPENSSL_DIR = $(ANDR_ROOT)/deps/$(OPENSSL_BASEDIR)/
101101
OPENSSL_LIB = $(OPENSSL_DIR)/libssl.a
@@ -392,7 +392,7 @@ $(LEVELDB_LIB): $(LEVELDB_TIMESTAMP)
392392
endif
393393

394394
clean_leveldb :
395-
$(RM) -rf deps/leveldb
395+
./gradlew cleanLevelDB
396396

397397
$(FREETYPE_TIMESTAMP) : freetype_download
398398
@LAST_MODIF=$$(find ${FREETYPE_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
@@ -439,7 +439,7 @@ $(FREETYPE_LIB) : $(FREETYPE_TIMESTAMP)
439439
fi
440440

441441
clean_freetype :
442-
$(RM) -rf ${FREETYPE_DIR}
442+
./gradlew cleanFreetype
443443

444444
$(ICONV_TIMESTAMP) : iconv_download
445445
@LAST_MODIF=$$(find ${ICONV_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
@@ -502,7 +502,7 @@ $(ICONV_LIB) : $(ICONV_TIMESTAMP)
502502
fi
503503

504504
clean_iconv :
505-
$(RM) -rf ${ICONV_DIR}
505+
./gradlew cleanIconv
506506

507507
#Note: Texturehack patch is required for gpu's not supporting color format
508508
# correctly. Known bad GPU:
@@ -559,7 +559,7 @@ $(IRRLICHT_LIB): $(IRRLICHT_TIMESTAMP) $(FREETYPE_LIB)
559559
fi
560560

561561
clean_irrlicht :
562-
$(RM) -rf deps/irrlicht
562+
./gradlew cleanIrrlicht
563563

564564
$(CURL_TIMESTAMP) : curl_download
565565
@LAST_MODIF=$$(find ${CURL_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
@@ -619,8 +619,7 @@ $(CURL_LIB): $(CURL_TIMESTAMP) $(OPENSSL_LIB)
619619
fi
620620

621621
clean_curl :
622-
$(RM) -rf deps/curl-${CURL_VERSION} \
623-
$(RM) -f deps/curl
622+
./gradlew cleanCURL
624623

625624
$(GMP_TIMESTAMP) : gmp_download
626625
@LAST_MODIF=$$(find ${GMP_DIR} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
@@ -679,8 +678,7 @@ $(GMP_LIB): $(GMP_TIMESTAMP)
679678
fi
680679

681680
clean_gmp:
682-
$(RM) -rf deps/gmp-${GMP_VERSION} \
683-
$(RM) -f deps/gmp
681+
./gradlew cleanGMP
684682

685683
sqlite3_download: deps/${SQLITE3_FOLDER}/sqlite3.c
686684

@@ -692,8 +690,7 @@ deps/${SQLITE3_FOLDER}/sqlite3.c :
692690
cd ${SQLITE3_FOLDER};
693691

694692
clean_sqlite3:
695-
cd deps && $(RM) -rf ${SQLITE3_FOLDER} && $(RM) -f ${SQLITE3_FOLDER}.zip && \
696-
$(RM) -f sqlite
693+
./gradlew cleanSQLite3
697694

698695
$(ASSETS_TIMESTAMP) : $(IRRLICHT_LIB)
699696
@mkdir -p ${ANDR_ROOT}/deps; \
@@ -771,7 +768,7 @@ assets : $(ASSETS_TIMESTAMP)
771768
fi
772769

773770
clean_assets :
774-
@$(RM) -r ${APP_ROOT}/assets
771+
./gradlew cleanAssets
775772

776773
apk: local.properties assets $(ICONV_LIB) $(IRRLICHT_LIB) $(CURL_LIB) $(GMP_LIB) $(LEVELDB_TARGET) \
777774
$(OPENAL_LIB) $(OGG_LIB) prep_srcdir $(ANDR_ROOT)/jni/src/android_version.h \
@@ -804,24 +801,20 @@ install_release:
804801

805802
prep_srcdir :
806803
@if [ ! -e ${ANDR_ROOT}/jni/src ]; then \
807-
ln -s ${PROJ_ROOT}/src ${ANDR_ROOT}/jni/src; \
804+
ln -s ${PROJ_ROOT}/src ${ANDR_ROOT}/jni/src; \
808805
fi; \
809806
if [ ! -e ${ANDR_ROOT}/jni/lib ]; then \
810-
ln -s ${PROJ_ROOT}/lib ${ANDR_ROOT}/jni/lib; \
807+
ln -s ${PROJ_ROOT}/lib ${ANDR_ROOT}/jni/lib; \
811808
fi
812809

813810
clean_apk :
814811
./gradlew clean
815812

816813
clean_all :
817-
@$(MAKE) clean_apk; \
818-
$(MAKE) clean_assets clean_iconv clean_irrlicht clean_leveldb clean_curl \
819-
clean_openssl clean_openal clean_ogg clean_gmp; \
820-
sleep 1; \
821-
$(RM) -r gen libs obj deps bin Debug and_env
814+
./gradlew cleanAll
822815

823816
$(ANDR_ROOT)/jni/src/android_version_githash.h : prep_srcdir
824-
@export VERSION_FILE=${ANDR_ROOT}/jni/src/android_version_githash.h; \
817+
@export VERSION_FILE=${ANDR_ROOT}/jni/src/android_version_githash.h; \
825818
export VERSION_FILE_NEW=$${VERSION_FILE}.new; \
826819
{ \
827820
echo "#ifndef ANDROID_MT_VERSION_GITHASH_H"; \

Diff for: ‎build/android/build.gradle

+68
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ buildscript {
99
}
1010
}
1111

12+
def curl_version = "7.60.0"
13+
def gmp_version = "6.1.2"
14+
def irrlicht_revision = "5150"
15+
def openal_version = "1.18.2"
16+
def openssl_version = "1.0.2n"
17+
def sqlite3_version = "3240000"
18+
1219
apply plugin: "com.android.application"
1320

1421
android {
@@ -54,3 +61,64 @@ android {
5461
}
5562
}
5663
}
64+
65+
task cleanAssets(type:Delete) {
66+
delete 'src/main/assets'
67+
}
68+
69+
task cleanIconv(type:Delete) {
70+
delete 'deps/libiconv'
71+
}
72+
73+
task cleanIrrlicht(type:Delete) {
74+
delete 'deps/irrlicht'
75+
}
76+
77+
task cleanLevelDB(type:Delete) {
78+
delete 'deps/leveldb'
79+
}
80+
81+
task cleanCURL(type:Delete) {
82+
delete 'deps/curl'
83+
delete 'deps/curl-' + curl_version
84+
}
85+
86+
task cleanOpenSSL(type:Delete) {
87+
delete 'deps/openssl'
88+
delete 'deps/openssl-' + openssl_version
89+
delete 'deps/openssl-' + openssl_version + '.tar.gz'
90+
}
91+
92+
task cleanOpenAL(type:Delete) {
93+
delete 'deps/openal-soft'
94+
}
95+
96+
task cleanFreetype(type:Delete) {
97+
delete 'deps/freetype2-android'
98+
}
99+
100+
task cleanOgg(type:Delete) {
101+
delete 'deps/libvorbis-libogg-android'
102+
}
103+
104+
task cleanSQLite3(type:Delete) {
105+
delete 'deps/sqlite-amalgamation-' + sqlite3_version
106+
delete 'deps/sqlite-amalgamation-' + sqlite3_version + '.zip'
107+
}
108+
109+
task cleanGMP(type:Delete) {
110+
delete 'deps/gmp'
111+
delete 'deps/gmp-' + gmp_version
112+
}
113+
114+
task cleanAll(type:Delete, dependsOn:[clean,cleanAssets,cleanIconv,
115+
cleanFreetype,cleanIrrlicht,cleanLevelDB,cleanSQLite3,cleanCURL,
116+
cleanOpenSSL,cleanOpenAL,cleanOgg,cleanGMP]) {
117+
delete 'deps'
118+
delete 'gen'
119+
delete 'libs'
120+
delete 'obj'
121+
delete 'bin'
122+
delete 'Debug'
123+
delete 'and_env'
124+
}

0 commit comments

Comments
 (0)
Please sign in to comment.