From 2184e6e2428e3b3f85a704e7a833701cc5fb8e52 Mon Sep 17 00:00:00 2001 From: Tristan Matthews Date: Tue, 16 Jul 2013 11:24:32 -0400 Subject: [PATCH] * #26839: daemon: remove Android.mk files Downstream Android client is now responsible for managing the build of the daemon. --- daemon/Android.mk | 2 - daemon/src/Android.mk | 205 -------------------------- daemon/src/audio/Android.mk | 42 ------ daemon/src/audio/audiortp/Android.mk | 45 ------ daemon/src/audio/codecs/Android.mk | 212 --------------------------- daemon/src/audio/opensl/Android.mk | 32 ---- daemon/src/audio/sound/Android.mk | 33 ----- daemon/src/client/Android.mk | 72 --------- daemon/src/config/Android.mk | 24 --- daemon/src/history/Android.mk | 31 ---- daemon/src/hooks/Android.mk | 17 --- daemon/src/im/Android.mk | 18 --- daemon/src/sip/Android.mk | 60 -------- 13 files changed, 793 deletions(-) delete mode 100644 daemon/Android.mk delete mode 100644 daemon/src/Android.mk delete mode 100644 daemon/src/audio/Android.mk delete mode 100644 daemon/src/audio/audiortp/Android.mk delete mode 100644 daemon/src/audio/codecs/Android.mk delete mode 100644 daemon/src/audio/opensl/Android.mk delete mode 100644 daemon/src/audio/sound/Android.mk delete mode 100644 daemon/src/client/Android.mk delete mode 100644 daemon/src/config/Android.mk delete mode 100644 daemon/src/history/Android.mk delete mode 100644 daemon/src/hooks/Android.mk delete mode 100644 daemon/src/im/Android.mk delete mode 100644 daemon/src/sip/Android.mk diff --git a/daemon/Android.mk b/daemon/Android.mk deleted file mode 100644 index 833843220..000000000 --- a/daemon/Android.mk +++ /dev/null @@ -1,2 +0,0 @@ -include $(call all-subdir-makefiles) - diff --git a/daemon/src/Android.mk b/daemon/src/Android.mk deleted file mode 100644 index 98fe119e2..000000000 --- a/daemon/src/Android.mk +++ /dev/null @@ -1,205 +0,0 @@ -# /!\ absolutely necessary when including submakefiles -# and defining targets in the "same Android.mk" -MYSRC_LOCAL_PATH := $(call my-dir) -#include $(call all-subdir-makefiles) -include $(MYSRC_LOCAL_PATH)/audio/codecs/Android.mk - -LOCAL_PATH := $(MYSRC_LOCAL_PATH) - -# FIXME -VERSION="1.1.0" -MY_PREFIX=/sdcard -MY_DATADIR=/data/data -TARGET_NAME=arm-unknown-linux-androideabi - -MY_PJPROJECT=pjproject-android -MY_COMMONCPP=commoncpp2-1.8.1-android -MY_CCRTP=ccrtp-1.8.0-android -MY_LIBSAMPLE=libsamplerate-0.1.8 -MY_DBUSCPP=libdbus-c++-0.9.0-android -MY_DBUS=libdbus-c++-0.9.0-android -MY_SPEEX=speex -MY_OPENSSL=openssl -MY_LIBYAML=libyaml -MY_LIBEXPAT=libexpat -MY_JNI_WRAP := $(LOCAL_PATH)/client/android/callmanager_wrap.cpp - -include $(CLEAR_VARS) - -$(MY_JNI_WRAP): $(LOCAL_PATH)/client/android/jni_interface.i $(LOCAL_PATH)/client/android/sflphoneservice.c.template - @echo "in $(MY_JNI_WRAP) target" - ./make-swig.sh - -LOCAL_SRC_FILES := \ - conference.cpp \ - voiplink.cpp \ - preferences.cpp \ - managerimpl.cpp \ - manager.cpp \ - eventthread.cpp \ - call.cpp \ - account.cpp \ - logger.cpp \ - numbercleaner.cpp \ - fileutils.cpp \ - audio/audioloop.cpp \ - audio/ringbuffer.cpp \ - audio/mainbuffer.cpp \ - audio/audiorecord.cpp \ - audio/audiorecorder.cpp \ - audio/recordable.cpp \ - audio/audiolayer.cpp \ - audio/samplerateconverter.cpp \ - audio/delaydetection.cpp \ - audio/gaincontrol.cpp \ - audio/dcblocker.cpp \ - audio/opensl/opensllayer.cpp \ - audio/sound/audiofile.cpp \ - audio/sound/tone.cpp \ - audio/sound/tonelist.cpp \ - audio/sound/dtmf.cpp \ - audio/sound/dtmfgenerator.cpp \ - audio/codecs/audiocodecfactory.cpp \ - audio/audiortp/audio_rtp_session.cpp \ - audio/audiortp/audio_symmetric_rtp_session.cpp \ - audio/audiortp/audio_rtp_record_handler.cpp \ - audio/audiortp/audio_rtp_factory.cpp \ - audio/audiortp/audio_srtp_session.cpp \ - config/sfl_config.cpp \ - config/yamlemitter.cpp \ - config/yamlparser.cpp \ - config/yamlnode.cpp \ - client/android/client.cpp \ - client/android/callmanager.cpp \ - client/android/configurationmanager.cpp \ - client/android/callmanager_wrap.cpp \ - history/historyitem.cpp \ - history/history.cpp \ - history/historynamecache.cpp \ - hooks/urlhook.cpp \ - im/instant_messaging.cpp \ - sip/sdp.cpp \ - sip/sipaccount.cpp \ - sip/sipcall.cpp \ - sip/sipvoiplink.cpp \ - sip/siptransport.cpp \ - sip/sip_utils.cpp \ - scoped_lock.cpp - - - - -# FIXME -LOCAL_C_INCLUDES += $(LOCAL_PATH) \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/audio \ - $(LOCAL_PATH)/audio/opensl \ - $(LOCAL_PATH)/audio/sound \ - $(LOCAL_PATH)/audio/codecs \ - $(LOCAL_PATH)/audio/audiortp \ - $(LOCAL_PATH)/config \ - $(LOCAL_PATH)/client/android \ - $(LOCAL_PATH)/history \ - $(LOCAL_PATH)/hooks \ - $(LOCAL_PATH)/im \ - $(LOCAL_PATH)/sip \ - $(APP_PROJECT_PATH)/jni/$(MY_SPEEX)/include \ - $(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP)/inc \ - $(APP_PROJECT_PATH)/jni/$(MY_LIBYAML)/inc \ - $(APP_PROJECT_PATH)/jni/$(MY_CCRTP)/src \ - $(APP_PROJECT_PATH)/jni/$(MY_DBUSCPP)/include \ - $(APP_PROJECT_PATH)/jni/$(MY_DBUS)/include \ - $(APP_PROJECT_PATH)/jni/$(MY_LIBSAMPLE)/src \ - $(APP_PROJECT_PATH)/jni/$(MY_OPENSSL)/include \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjsip/include \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjlib/include \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjlib-util/include \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjmedia/include \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjnath/include \ - $(APP_PROJECT_PATH)/jni/$(MY_LIBEXPAT) \ - $(APP_PROJECT_PATH)/jni/$(MY_SPEEX)/include - -LOCAL_MODULE := libsflphone - -LOCAL_CPPFLAGS += $(NETWORKMANAGER) \ - -DCCPP_PREFIX \ - -DCODECS_DIR=\"/usr/lib/sflphone/audio/codec\" \ - -DPREFIX=\"$(MY_PREFIX)\" \ - -DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \ - -DHAVE_CONFIG_H \ - -w \ - -std=gnu++0x -frtti -fexceptions -fpermissive \ - -DAPP_NAME=\"sflphone\" \ - -DSWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON \ - -DDEBUG_DIRECTOR_OWNED - -#-L$(APP_PROJECT_PATH)/obj/local/armeabi \ - -LOCAL_LDLIBS += -L$(APP_PROJECT_PATH)/obj/local/armeabi \ - -L$(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjsip/lib \ - -L$(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjlib/lib \ - -L$(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjlib-util/lib \ - -L$(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjmedia/lib \ - -L$(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjnath/lib \ - -lpjsua-$(TARGET_NAME) \ - -lpjsip-ua-$(TARGET_NAME) \ - -lpjsip-simple-$(TARGET_NAME) \ - -lpjsip-$(TARGET_NAME) \ - -lpjmedia-codec-$(TARGET_NAME) \ - -lpjmedia-$(TARGET_NAME) \ - -lpjnath-$(TARGET_NAME) \ - -lpjlib-util-$(TARGET_NAME) \ - -lpj-$(TARGET_NAME) \ - -lccgnu2 \ - -lccrtp1 \ - -lsamplerate \ - -lspeex \ - -lspeexresampler \ - -lsamplerate \ - -lccrtp1 \ - -lccgnu2 \ - -lyaml \ - -ldbus-c++-1 \ - -ldbus \ - -lexpat \ - -lcrypto \ - -lssl \ - -lz \ - -lcodec_ulaw \ - -lcodec_alaw \ - -llog \ - -lOpenSLES \ - -lgnustl_shared - -# LOCAL_STATIC_LIBRARIES (NDK documentation) -# The list of static libraries modules (built with BUILD_STATIC_LIBRARY) -# that should be linked to this module. This only makes sense in -# shared library modules. -LOCAL_STATIC_LIBRARIES += libpjsua-$(TARGET_NAME) \ - libpjsip-ua-$(TARGET_NAME) \ - libpjsip-simple-$(TARGET_NAME) \ - libpjsip-$(TARGET_NAME) \ - libpjmedia-codec-$(TARGET_NAME) \ - libpjmedia-$(TARGET_NAME) \ - libpjnath-$(TARGET_NAME) \ - libpjlib-util-$(TARGET_NAME) \ - libpj-$(TARGET_NAME) \ - libspeex \ - libdbus-c++-1 \ - libdbus \ - - -LOCAL_SHARED_LIBRARIES += libccgnu2 \ - libccrtp1 \ - libexpat_shared \ - libsamplerate \ - libcodec_ulaw \ - libcodec_alaw \ - libspeexresampler \ - libyaml - -include $(BUILD_SHARED_LIBRARY) - - - - diff --git a/daemon/src/audio/Android.mk b/daemon/src/audio/Android.mk deleted file mode 100644 index 2ee2f2b42..000000000 --- a/daemon/src/audio/Android.mk +++ /dev/null @@ -1,42 +0,0 @@ -MYAUDIO_LOCAL_PATH := $(call my-dir) -include $(call all-subdir-makefiles) - -LOCAL_PATH := $(MYAUDIO_LOCAL_PATH) - -# FIXME -MY_COMMONCPP=commoncpp2-1.8.1-android -MY_LIBSAMPLE=libsamplerate-0.1.8 -MY_DBUS=libdbus-c++-0.9.0-android - - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := audioloop.cpp \ - ringbuffer.cpp \ - mainbuffer.cpp \ - audiorecord.cpp \ - audiorecorder.cpp \ - recordable.cpp \ - audiolayer.cpp \ - samplerateconverter.cpp \ - delaydetection.cpp \ - gaincontrol.cpp \ - dcblocker.cpp - -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../.. \ - $(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP)/inc \ - $(APP_PROJECT_PATH)/jni/$(MY_DBUS)/include \ - $(APP_PROJECT_PATH)/jni/$(MY_LIBSAMPLE)/src - -LOCAL_MODULE := libaudio - -LOCAL_CPPFLAGS += $(NETWORKMANAGER) \ - -DCCPP_PREFIX \ - -DPREFIX=\"$(MY_PREFIX)\" \ - -DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \ - -DHAVE_CONFIG_H \ - -std=gnu++0x -frtti -fpermissive -fexceptions \ - -DAPP_NAME=\"audio\" - -include $(BUILD_STATIC_LIBRARY) diff --git a/daemon/src/audio/audiortp/Android.mk b/daemon/src/audio/audiortp/Android.mk deleted file mode 100644 index 86a4a3ae6..000000000 --- a/daemon/src/audio/audiortp/Android.mk +++ /dev/null @@ -1,45 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -MY_PJPROJECT=pjproject-android/android -MY_COMMONCPP=commoncpp2-1.8.1-android -MY_CCRTP=ccrtp-1.8.0-android -MY_DBUS=libdbus-c++-0.9.0-android -MY_SPEEX=speex -MY_OPENSSL=openssl -MY_LIBSAMPLE=libsamplerate-0.1.8 - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := audio_rtp_session.cpp \ - audio_symmetric_rtp_session.cpp \ - audio_rtp_record_handler.cpp \ - audio_rtp_factory.cpp \ - audio_srtp_session.cpp - -# FIXME -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../.. \ - $(APP_PROJECT_PATH)/jni/$(MY_SPEEX)/include \ - $(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP)/inc \ - $(APP_PROJECT_PATH)/jni/$(MY_CCRTP)/src \ - $(APP_PROJECT_PATH)/jni/$(MY_LIBSAMPLE)/src \ - $(APP_PROJECT_PATH)/jni/$(MY_DBUS)/include \ - $(APP_PROJECT_PATH)/jni/$(MY_OPENSSL)/include \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjsip/include \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjlib/include \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjlib-util/include \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjmedia/include - -LOCAL_MODULE := librtp - -LOCAL_CPPFLAGS += $(NETWORKMANAGER) \ - -DCCPP_PREFIX \ - -DPREFIX=\"$(MY_PREFIX)\" \ - -DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \ - -DHAVE_CONFIG_H \ - -std=gnu++0x -frtti -fpermissive \ - -DAPP_NAME=\"audiortp\" - -LOCAL_SHARED_LIBRARIES += libccrtp1 libccgnu2 - -include $(BUILD_STATIC_LIBRARY) diff --git a/daemon/src/audio/codecs/Android.mk b/daemon/src/audio/codecs/Android.mk deleted file mode 100644 index 6e335a34a..000000000 --- a/daemon/src/audio/codecs/Android.mk +++ /dev/null @@ -1,212 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -MY_COMMONCPP=commoncpp2-1.8.1-android -MY_CCRTP=ccrtp-1.8.0-android - -############# ulaw ############### - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := ulaw.cpp \ - audiocodec.cpp - -# FIXME -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../.. \ - $(APP_PROJECT_PATH)/jni/$(MY_CCRTP)/src \ - $(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP)/inc - -LOCAL_MODULE := libcodec_ulaw - -LOCAL_CPPFLAGS += $(NETWORKMANAGER) \ - -DCCPP_PREFIX \ - -DPREFIX=\"$(MY_PREFIX)\" \ - -DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \ - -std=gnu++0x -frtti -fpermissive -fexceptions \ - -DAPP_NAME=\"codec_ulaw\" - -include $(BUILD_SHARED_LIBRARY) - - - -############# alaw ############### - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := alaw.cpp \ - audiocodec.cpp - -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../.. \ - $(APP_PROJECT_PATH)/jni/$(MY_CCRTP)/src \ - $(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP)/inc \ - -LOCAL_MODULE := libcodec_alaw -LOCAL_CPPFLAGS += $(NETWORKMANAGER) \ - -DCCPP_PREFIX \ - -DPREFIX=\"$(MY_PREFIX)\" \ - -DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \ - -std=gnu++0x -frtti -fpermissive -fexceptions \ - -DAPP_NAME=\"codec_alaw\" - -LOCAL_LDFLAGS += -Wl,--export-dynamic - -include $(BUILD_SHARED_LIBRARY) - - -############# g722 ############### - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := g722.cpp \ - audiocodec.cpp - -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../.. \ - $(LOCAL_PATH)/../../.. \ - $(APP_PROJECT_PATH)/jni/$(MY_CCRTP)/src \ - $(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP)/inc - -LOCAL_MODULE := libcodec_g722 -LOCAL_CPPFLAGS += $(NETWORKMANAGER) \ - -DCCPP_PREFIX \ - -DCODECS_DIR=\"/usr/lib/sflphone/audio/codec\" \ - -DPREFIX=\"$(MY_PREFIX)\" \ - -DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \ - -DHAVE_COFIG_H \ - -std=gnu++0x -frtti -fpermissive -fexceptions \ - -DAPP_NAME=\"codecfactory\" - -include $(BUILD_SHARED_LIBRARY) - - - -############# opus ############### - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := opus.cpp \ - audiocodec.cpp - -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../.. \ - $(LOCAL_PATH)/../../.. \ - $(APP_PROJECT_PATH)/jni/$(MY_CCRTP)/src \ - $(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP)/inc - -LOCAL_MODULE := libcodec_opus -LOCAL_CPPFLAGS += $(NETWORKMANAGER) \ - -DCCPP_PREFIX \ - -DCODECS_DIR=\"/usr/lib/sflphone/audio/codec\" \ - -DPREFIX=\"$(MY_PREFIX)\" \ - -DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \ - -DHAVE_COFIG_H \ - -std=gnu++0x -frtti -fpermissive -fexceptions \ - -DAPP_NAME=\"codecfactory\" - -include $(BUILD_SHARED_LIBRARY) - - - - -############# speex_nb ############### - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := speexcodec_nb.cpp \ - audiocodec.cpp - -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../.. \ - $(LOCAL_PATH)/../../.. \ - $(APP_PROJECT_PATH)/jni/$(MY_CCRTP)/src \ - $(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP)/inc - -LOCAL_MODULE := libcodec_speex_nb -LOCAL_CPPFLAGS += $(NETWORKMANAGER) \ - -DCCPP_PREFIX \ - -DCODECS_DIR=\"/usr/lib/sflphone/audio/codec\" \ - -DPREFIX=\"$(MY_PREFIX)\" \ - -DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \ - -DHAVE_COFIG_H \ - -std=gnu++0x -frtti -fpermissive -fexceptions \ - -DAPP_NAME=\"codecfactory\" - -include $(BUILD_SHARED_LIBRARY) - - - -############# speex_ub ############### - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := speexcodec_ub.cpp \ - audiocodec.cpp - -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../.. \ - $(LOCAL_PATH)/../../.. \ - $(APP_PROJECT_PATH)/jni/$(MY_CCRTP)/src \ - $(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP)/inc - -LOCAL_MODULE := libcodec_speex_ub -LOCAL_CPPFLAGS += $(NETWORKMANAGER) \ - -DCCPP_PREFIX \ - -DCODECS_DIR=\"/usr/lib/sflphone/audio/codec\" \ - -DPREFIX=\"$(MY_PREFIX)\" \ - -DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \ - -DHAVE_COFIG_H \ - -std=gnu++0x -frtti -fpermissive -fexceptions \ - -DAPP_NAME=\"codecfactory\" - -include $(BUILD_SHARED_LIBRARY) - -############# speex_wb ############### - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := speexcodec_wb.cpp \ - audiocodec.cpp - -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../.. \ - $(LOCAL_PATH)/../../.. \ - $(APP_PROJECT_PATH)/jni/$(MY_CCRTP)/src \ - $(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP)/inc - -LOCAL_MODULE := libcodec_speex_wb -LOCAL_CPPFLAGS += $(NETWORKMANAGER) \ - -DCCPP_PREFIX \ - -DCODECS_DIR=\"/usr/lib/sflphone/audio/codec\" \ - -DPREFIX=\"$(MY_PREFIX)\" \ - -DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \ - -DHAVE_COFIG_H \ - -std=gnu++0x -frtti -fpermissive -fexceptions \ - -DAPP_NAME=\"codecfactory\" - -include $(BUILD_SHARED_LIBRARY) - - -############# audiocodecfactory ############### - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := audiocodecfactory.cpp - -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../.. \ - $(LOCAL_PATH)/../../.. \ - $(APP_PROJECT_PATH)/jni/$(MY_CCRTP)/src \ - $(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP)/inc - -LOCAL_MODULE := libcodecfactory -LOCAL_CPPFLAGS += $(NETWORKMANAGER) \ - -DCCPP_PREFIX \ - -DCODECS_DIR=\"/usr/lib/sflphone/audio/codec\" \ - -DPREFIX=\"$(MY_PREFIX)\" \ - -DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \ - -DHAVE_COFIG_H \ - -std=gnu++0x -frtti -fpermissive -fexceptions \ - -DAPP_NAME=\"codecfactory\" - -include $(BUILD_STATIC_LIBRARY) diff --git a/daemon/src/audio/opensl/Android.mk b/daemon/src/audio/opensl/Android.mk deleted file mode 100644 index 0b6582b4e..000000000 --- a/daemon/src/audio/opensl/Android.mk +++ /dev/null @@ -1,32 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -# FIXME -MY_COMMONCPP=commoncpp2-1.8.1-android -MY_CCRTP=ccrtp-1.8.0-android -MY_LIBSAMPLE=libsamplerate-0.1.8 - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := opensllayer.cpp - -# FIXME -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../.. \ - $(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP)/inc \ - $(APP_PROJECT_PATH)/jni/$(MY_CCRTP)/src \ - $(APP_PROJECT_PATH)/jni/$(MY_LIBSAMPLE)/src - - - -LOCAL_MODULE := libopensl -LOCAL_CPPFLAGS += $(NETWORKMANAGER) \ - -DCCPP_PREFIX \ - -DPREFIX=\"$(MY_PREFIX)\" \ - -DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \ - -DHAVE_CONFIG_H \ - -std=gnu++0x -frtti -fpermissive \ - -DAPP_NAME=\"openSL\" - -LOCAL_SHARED_LIBRARIES += libOpenSLES - -include $(BUILD_STATIC_LIBRARY) diff --git a/daemon/src/audio/sound/Android.mk b/daemon/src/audio/sound/Android.mk deleted file mode 100644 index d22bc2e44..000000000 --- a/daemon/src/audio/sound/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -# FIXME -MY_COMMONCPP=commoncpp2-1.8.1-android -MY_CCRTP=ccrtp-1.8.0-android -MY_LIBSAMPLE=libsamplerate-0.1.8 - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := audiofile.cpp \ - tone.cpp \ - tonelist.cpp \ - dtmf.cpp \ - dtmfgenerator.cpp - -# FIXME -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../.. \ - $(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP)/inc \ - $(APP_PROJECT_PATH)/jni/$(MY_CCRTP)/src \ - $(APP_PROJECT_PATH)/jni/$(MY_LIBSAMPLE)/src \ - -LOCAL_MODULE := libsound - -LOCAL_CPPFLAGS += $(NETWORKMANAGER) \ - -DCCPP_PREFIX \ - -DPREFIX=\"$(MY_PREFIX)\" \ - -DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \ - -DHAVE_CONFIG_H \ - -std=gnu++0x -frtti -fpermissive -fexceptions \ - -DAPP_NAME=\"sound\" - -include $(BUILD_STATIC_LIBRARY) diff --git a/daemon/src/client/Android.mk b/daemon/src/client/Android.mk deleted file mode 100644 index 81ba28bd5..000000000 --- a/daemon/src/client/Android.mk +++ /dev/null @@ -1,72 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -$(warning Android.mk -> $(LOCAL_PATH)) - -# FIXME -MY_PREFIX=/sdcard -MY_DATADIR= -MY_PJPROJECT="pjproject-android" -MY_PJDIR= -MY_COMMONCPP=commoncpp2-1.8.1-android -MY_CCRTP=ccrtp-1.8.0-android -MY_LIBSAMPLE=libsamplerate-0.1.8 - -# FIXME -ifneq ($(SFL_VIDEO),) -video_SOURCES += video_controls.cpp -video_controls-glue.h: video_controls-introspec.xml Makefile.am - dbusxx-xml2cpp $< --adaptor=$@ -endif - -ifneq ($(USE_NETWORKMANAGER),) -network_SOURCES += networkmanager.cpp -NETWORKMANAGER = -DUSE_NETWORKMANAGER -endif - -include $(CLEAR_VARS) - -# FIXME -# Rule to generate the binding headers -%-glue.h: %-introspec.xml Android.mk - dbusxx-xml2cpp $< --adaptor=$@ - -LOCAL_SRC_FILES := $(video_SOURCES) $(network_SOURCES) \ - android/callmanager.cpp \ - android/configurationmanager.cpp \ - android/instance.cpp \ -# dbusmanager.cpp \ -# callmanager-glue.h \ -# configurationmanager-glue.h \ - android/instance-glue.h - -# FIXME -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../.. \ - $(LOCAL_PATH)/../sip \ - $(LOCAL_PATH)/../config \ - $(LOCAL_PATH)/../history \ - $(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP)/inc \ - $(APP_PROJECT_PATH)/jni/$(MY_CCRTP)/src \ - $(APP_PROJECT_PATH)/jni/$(MY_LIBSAMPLE)/src \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/third_party/speex/include \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/third_party/build/speex \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjsip/include \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjlib/include \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjlib-util/include \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjmedia/include \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjnath/include \ - -#LOCAL_CPP_EXTENSION := .cpp .h - -LOCAL_MODULE := libdbus-glue -LOCAL_CPPFLAGS += $(NETWORKMANAGER) \ - -DPREFIX=\"$(MY_PREFIX)\" \ - -DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \ - -DHAVE_CONFIG_H \ - -std=gnu++0x -frtti -fpermissive \ - -DAPP_NAME=\"dbus-glue\" - -LOCAL_SHARED_LIBRARIES += libdbus-c++-1 - -include $(BUILD_STATIC_LIBRARY) - diff --git a/daemon/src/config/Android.mk b/daemon/src/config/Android.mk deleted file mode 100644 index dee60a3fa..000000000 --- a/daemon/src/config/Android.mk +++ /dev/null @@ -1,24 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -MY_LIBYAML=libyaml - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - sfl_config.cpp \ - yamlemitter.cpp \ - yamlparser.cpp \ - yamlnode.cpp - -# FIXME -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../.. \ - $(APP_PROJECT_PATH)/jni/$(MY_LIBYAML)/inc -LOCAL_MODULE := libconfig -LOCAL_CPPFLAGS += -std=gnu++0x -fexceptions -frtti \ - -DAPP_NAME=\"config\" -LOCAL_LDFLAGS += -L$(APP_PROJECT_PATH)/obj/local/armeabi \ - -lyaml -LOCAL_SHARED_LIBRARIES += libyaml - -include $(BUILD_STATIC_LIBRARY) diff --git a/daemon/src/history/Android.mk b/daemon/src/history/Android.mk deleted file mode 100644 index 1085c819b..000000000 --- a/daemon/src/history/Android.mk +++ /dev/null @@ -1,31 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -MY_COMMONCPP=commoncpp2-1.8.1-android -MY_LIBSAMPLE=libsamplerate-0.1.8 -MY_DBUS=libdbus-c++-0.9.0-android - - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := historyitem.cpp \ - history.cpp \ - historynamecache.cpp - -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../.. \ - $(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP)/inc \ - $(APP_PROJECT_PATH)/jni/$(MY_DBUS)/include \ - $(APP_PROJECT_PATH)/jni/$(MY_LIBSAMPLE)/src - -LOCAL_MODULE := libhistory - -LOCAL_CPPFLAGS += $(NETWORKMANAGER) \ - -DCCPP_PREFIX \ - -DPREFIX=\"$(MY_PREFIX)\" \ - -DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \ - -DHAVE_CONFIG_H \ - -std=gnu++0x -frtti -fpermissive -fexceptions \ - -DAPP_NAME=\"history\" - - -include $(BUILD_STATIC_LIBRARY) diff --git a/daemon/src/hooks/Android.mk b/daemon/src/hooks/Android.mk deleted file mode 100644 index 906da6fe0..000000000 --- a/daemon/src/hooks/Android.mk +++ /dev/null @@ -1,17 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := urlhook.cpp - -LOCAL_MODULE := libhooks -LOCAL_CPPFLAGS += $(NETWORKMANAGER) \ - -DCCPP_PREFIX \ - -DPREFIX=\"$(MY_PREFIX)\" \ - -DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \ - -DHAVE_CONFIG_H \ - -std=gnu++0x -frtti -fpermissive -fexceptions \ - -DAPP_NAME=\"hooks\" - - -include $(BUILD_STATIC_LIBRARY) diff --git a/daemon/src/im/Android.mk b/daemon/src/im/Android.mk deleted file mode 100644 index e2c78ae23..000000000 --- a/daemon/src/im/Android.mk +++ /dev/null @@ -1,18 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -MY_PJPROJECT="pjproject-android/android" -MY_EXPAT="libexpat" - -$(warning Android.mk -> $(LOCAL_PATH)) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := instant_messaging.cpp - -# FIXME -LOCAL_C_INCLUDES += $(LOCAL_PATH)/include-all - - -LOCAL_MODULE := libim - -include $(BUILD_STATIC_LIBRARY) \ No newline at end of file diff --git a/daemon/src/sip/Android.mk b/daemon/src/sip/Android.mk deleted file mode 100644 index 8c1f5c3c6..000000000 --- a/daemon/src/sip/Android.mk +++ /dev/null @@ -1,60 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -# FIXME -MY_PREFIX=/sdcard -MY_DATADIR= -MY_PJPROJECT="pjproject-android" -MY_PJDIR= -MY_COMMONCPP=commoncpp2-1.8.1-android -MY_CCRTP=ccrtp-1.8.0-android -MY_LIBSAMPLE=libsamplerate-0.1.8 -MY_YAML=libyaml - -# FIXME -ifneq ($(BUILD_SDES),) -libsiplink_la_SOURCES += sdes_negotiator.cpp \ - pattern.cpp - -libsiplink_la_CXXFLAGS = \ - @PCRE_LIBS@ -endif - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - sdp.cpp \ - sipaccount.cpp \ - sipcall.cpp \ - sipvoiplink.cpp \ - siptransport.cpp \ - sip_utils.cpp - -# FIXME -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../.. \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/third_party/build/speex \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/third_party/speex/include \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjmedia/include \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjlib/include \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjsip/include \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjlib-util/include \ - $(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjnath/include \ - $(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP)/inc \ - $(APP_PROJECT_PATH)/jni/$(MY_LIBSAMPLE)/src \ - $(APP_PROJECT_PATH)/jni/$(MY_CCRTP)/src \ - $(APP_PROJECT_PATH)/jni/$(MY_YAML)/inc \ - $(LOCAL_PATH)/../../libs/iax2 \ - -#LOCAL_CPP_EXTENSION := .cpp .h - -LOCAL_MODULE := libsiplink -LOCAL_CPPFLAGS += $(NETWORKMANAGER) \ - -DPREFIX=\"$(MY_PREFIX)\" \ - -DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \ - -DHAVE_CONFIG_H \ - -std=gnu++0x -frtti -fpermissive \ - -DAPP_NAME=\"sip\" - -LOCAL_SHARED_LIBRARIES += libdbus-c++-1 - -include $(BUILD_STATIC_LIBRARY)