diff --git a/Makefile b/Makefile index 351814a37..b3651dbd0 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,6 @@ else HTTPS_CA_DIR=$(OPENSSL_DIR) endif -NDK_BUILD_OPTIONS=NDK_DEBUG=$(NDK_DEBUG) LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_UPNP=$(BUILD_UPNP) BUILD_REMOTE_PROVISIONING=$(BUILD_REMOTE_PROVISIONING) BUILD_X264=$(BUILD_X264) BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_FOR_X86=$(BUILD_FOR_X86) USE_JAVAH=$(USE_JAVAH) -j$(NUMCPUS) all: update-project prepare-sources generate-apk diff --git a/liblinphone_tester/res/raw/.gitignore b/liblinphone_tester/res/raw/.gitignore new file mode 100644 index 000000000..40abfa847 --- /dev/null +++ b/liblinphone_tester/res/raw/.gitignore @@ -0,0 +1,12 @@ +agent.pem +cacert.pem +empty_rc +laure_rc +marie_early_rc +marie_no_sdp_rc +marie_rc +multi_account_lrc +pauline_rc +rootca.pem +tester_hosts +upnp_rc