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

Add temporary check in case of MediastreamerActivity.java still existing, to avoid compilation error

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-02-13 15:47:33 +01:00
parent 5b32131afe
commit 450f759f9f
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -92,6 +92,12 @@ else
ANT=ant -e ANT=ant -e
endif endif
# Temporary check: in case of MediastreamActivity.java file existing while it should not anymore, print an error message
# and abort build since otherwise java compilation will fail.
ifneq ($(shell ls ./submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/MediastreamerActivity.java 2>/dev/null),)
$(error ./submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/MediastreamerActivity.java found: please either remove it or move it to MediastreamActivity.java.ignored before continuing.)
endif
all: update-project generate-apk all: update-project generate-apk
ifeq ($(ENABLE_GPL_THIRD_PARTIES),1) ifeq ($(ENABLE_GPL_THIRD_PARTIES),1)
@echo "***************************************************************************" @echo "***************************************************************************"