From 92ba15cfc24e75e71887de44c930d5965756d0c7 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 18 Jun 2013 09:37:49 +0200
Subject: [PATCH] Remove prebuilts, better use the awsome ccache.

---
 jni/Android.mk | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index 4f6f676c4..6390ab9c2 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -49,31 +49,17 @@ include $(linphone-root-dir)/submodules/linphone/build/android/lpc2xml.mk
 endif
 
 # Speex
-ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/speex.mk),)
 include $(linphone-root-dir)/submodules/externals/build/speex/Android.mk
-else
-include $(linphone-root-dir)/submodules/externals/prebuilts/speex.mk
-endif
 
 # Gsm
-ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/gsm.mk),)
 include $(linphone-root-dir)/submodules/externals/build/gsm/Android.mk
-else
-include $(linphone-root-dir)/submodules/externals/prebuilts/gsm.mk
-endif
 
 include $(linphone-root-dir)/submodules/externals/build/exosip/Android.mk
 
 include $(linphone-root-dir)/submodules/externals/build/osip/Android.mk
 
 # Openssl
-ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/ssl.mk),)
 include $(linphone-root-dir)/submodules/externals/openssl/Android.mk
-else
-include $(linphone-root-dir)/submodules/externals/prebuilts/ssl.mk
-include $(linphone-root-dir)/submodules/externals/prebuilts/crypto.mk
-endif
-
 
 include $(linphone-root-dir)/submodules/linphone/oRTP/build/android/Android.mk
 
@@ -101,19 +87,11 @@ ifeq (,$(DUMP_VAR))
 $(info Build X264 plugin for mediastreamer2)
 endif
 include $(linphone-root-dir)/submodules/msx264/Android.mk
-ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/x264.mk),)
 include $(linphone-root-dir)/submodules/externals/build/x264/Android.mk
-else
-include $(linphone-root-dir)/submodules/externals/prebuilts/x264.mk
-endif
 endif
 
-ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/ffmpeg.mk),)
 include $(linphone-root-dir)/submodules/externals/build/ffmpeg/Android.mk
 include $(linphone-root-dir)/submodules/externals/build/ffmpeg-no-neon/Android.mk
-else
-include $(linphone-root-dir)/submodules/externals/prebuilts/ffmpeg.mk
-endif
 
 include $(linphone-root-dir)/submodules/externals/build/libvpx/Android.mk
 endif #armeabi-v7a
@@ -123,11 +101,7 @@ ifeq ($(BUILD_GPLV3_ZRTP), 1)
 ifeq (,$(DUMP_VAR))
 $(info Build ZRTP support - makes application GPLv3)
 endif
-ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/zrtpcpp.mk),)
 include $(linphone-root-dir)/submodules/externals/build/libzrtpcpp/Android.mk
-else
-include $(linphone-root-dir)/submodules/externals/prebuilts/zrtpcpp.mk
-endif
 endif
 
 ifeq ($(BUILD_SRTP), 1)