From 239050d73cb29a9863c5d6c3744b76d601c0e9f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 2 Jul 2014 13:41:27 +0300 Subject: [PATCH] Ignore failures in cleaning android projects If the android test projects hasn't been built yet, the "make clean" command will stop at "ant clean" (which fails since build.xml doesn't exist yet). If this happens, one still would want to run the "make clean" command to the end, cleaning up any possible intermediate object files (e.g. from a build for a different platform). --- Makefile | 2 +- build/platform-android.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e391eade..79eb6392 100644 --- a/Makefile +++ b/Makefile @@ -237,7 +237,7 @@ codec_unittest$(EXEEXT): $(LIBPREFIX)ut.$(SHAREDLIBSUFFIX) clean_Android: clean_Android_ut clean_Android_ut: - cd ./test/build/android && $(NDKROOT)/ndk-build APP_ABI=$(APP_ABI) clean && ant clean + -cd ./test/build/android && $(NDKROOT)/ndk-build APP_ABI=$(APP_ABI) clean && ant clean else codec_unittest$(EXEEXT): $(DECODER_UNITTEST_OBJS) $(ENCODER_UNITTEST_OBJS) $(PROCESSING_UNITTEST_OBJS) $(API_TEST_OBJS) $(COMMON_UNITTEST_OBJS) $(CODEC_UNITTEST_DEPS) diff --git a/build/platform-android.mk b/build/platform-android.mk index 93bf1341..c88a5c24 100644 --- a/build/platform-android.mk +++ b/build/platform-android.mk @@ -62,9 +62,9 @@ encdemo: libraries clean_Android: clean_Android_dec clean_Android_enc clean_Android_dec: - cd ./codec/build/android/dec && $(NDKROOT)/ndk-build APP_ABI=$(APP_ABI) clean && ant clean + -cd ./codec/build/android/dec && $(NDKROOT)/ndk-build APP_ABI=$(APP_ABI) clean && ant clean clean_Android_enc: - cd ./codec/build/android/enc && $(NDKROOT)/ndk-build APP_ABI=$(APP_ABI) clean && ant clean + -cd ./codec/build/android/enc && $(NDKROOT)/ndk-build APP_ABI=$(APP_ABI) clean && ant clean COMMON_INCLUDES += -I$(NDKROOT)/sources/android/cpufeatures COMMON_OBJS += $(COMMON_SRCDIR)/cpu-features.$(OBJ)