Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove deprecated android tools

Browse source
This commit is contained in:
Erwan Croze 2017-03-16 17:34:22 +01:00
parent 8eb2ae9374
commit d6aa0739b3
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
prepare.py
View file

@ -205,14 +205,13 @@ class AndroidPreparator(prepare.Preparator):
archs={archs} archs={archs}
TOPDIR=$(shell pwd) TOPDIR=$(shell pwd)
LINPHONE_ANDROID_VERSION=$(shell git describe --always) LINPHONE_ANDROID_VERSION=$(shell git describe --always)
ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep -E 'android-[0-9]+' | tail -n1)
ANT_SILENT=$(shell ant -h | grep -q -- -S && echo 1 || echo 0) ANT_SILENT=$(shell ant -h | grep -q -- -S && echo 1 || echo 0)
PACKAGE_NAME=$(shell sed -nE 's|<property name="linphone.package.name" value="(.*)" />|\\1|p' custom_rules.xml) PACKAGE_NAME=$(shell sed -nE 's|<property name="linphone.package.name" value="(.*)" />|\\1|p' custom_rules.xml)
.PHONY: all .PHONY: all
.NOTPARALLEL: all generate-apk generate-mediastreamer2-apk install release .NOTPARALLEL: all generate-apk generate-mediastreamer2-apk install release
all: update-project generate-apk all: generate-apk
build: $(addsuffix -build, $(archs)) build: $(addsuffix -build, $(archs))
@ -307,15 +306,10 @@ copy-libs:
\t\tcp -f liblinphone-sdk/android-x86/bin/gdb.setup libs/x86; \\ \t\tcp -f liblinphone-sdk/android-x86/bin/gdb.setup libs/x86; \\
\tfi \tfi
update-project:
\tandroid update project --path . --target $(ANDROID_MOST_RECENT_TARGET)
\tandroid update test-project --path tests -m .
update-mediastreamer2-project: update-mediastreamer2-project:
\t@cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \\ \t@cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \\
\tandroid update project --path . --target $(ANDROID_MOST_RECENT_TARGET)
generate-apk: java-clean build copy-libs $(TOPDIR)/res/raw/rootca.pem update-project generate-apk: java-clean build copy-libs $(TOPDIR)/res/raw/rootca.pem
\techo "version.name=$(LINPHONE_ANDROID_VERSION)" > default.properties && \\ \techo "version.name=$(LINPHONE_ANDROID_VERSION)" > default.properties && \\
\t./gradlew assembleDebug \t./gradlew assembleDebug
@ -332,7 +326,7 @@ install-apk:
uninstall: uninstall:
\tadb uninstall $(PACKAGE_NAME) \tadb uninstall $(PACKAGE_NAME)
release: java-clean build copy-libs update-project release: java-clean build copy-libs
\t./gradlew assembleRelease \t./gradlew assembleRelease
generate-sdk: liblinphone-android-sdk generate-sdk: liblinphone-android-sdk
@ -357,10 +351,10 @@ run-liblinphone-tests:
\t@cd liblinphone_tester && \\ \t@cd liblinphone_tester && \\
\tmake run-all-tests \tmake run-all-tests
run-basic-tests: clean update-project run-basic-tests: clean
\t$(MAKE) -C tests run-basic-tests ANT_SILENT=$(ANT_SILENT) \t$(MAKE) -C tests run-basic-tests ANT_SILENT=$(ANT_SILENT)
run-all-tests: clean update-project run-all-tests: clean
\t$(MAKE) -C tests run-all-tests ANT_SILENT=$(ANT_SILENT) \t$(MAKE) -C tests run-all-tests ANT_SILENT=$(ANT_SILENT)
pull-transifex: pull-transifex: