ref: 0ef26d6a3ff5b89af0f59a56c6e8955292d99722
parent: 2c250179dc9439913085944583421b9af6c6a42b
parent: 239050d73cb29a9863c5d6c3744b76d601c0e9f2
author: zhilwang <[email protected]>
date: Thu Jul 3 09:46:59 EDT 2014
Merge pull request #1068 from mstorsjo/android-clean Ignore failures in cleaning android projects
--- a/Makefile
+++ b/Makefile
@@ -237,7 +237,7 @@
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)
--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -62,9 +62,9 @@
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)