Skip to content
Snippets Groups Projects
Commit 47b6aaaf authored by Alexandre Lision's avatar Alexandre Lision
Browse files

build: remove duplicate env variable

SFLPHONE_SRC was a duplicate of SFLPHONE_SRC_DIR
parent 853296cf
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,6 @@ export ANDROID_HOME=$(ANDROID_SDK) ...@@ -5,7 +5,6 @@ export ANDROID_HOME=$(ANDROID_SDK)
ARCH = $(ANDROID_ABI) ARCH = $(ANDROID_ABI)
SRC=sflphone-android SRC=sflphone-android
export SFLPHONE_SRC=$(PWD)/sflphone
LIBSFLPHONEJNI_H=sflphone/daemon/src/sflphone.h LIBSFLPHONEJNI_H=sflphone/daemon/src/sflphone.h
LIBSFLPHONEJNI=$(SRC)/obj/local/$(ARCH)/libsflphone.so LIBSFLPHONEJNI=$(SRC)/obj/local/$(ARCH)/libsflphone.so
......
...@@ -31,7 +31,6 @@ LOCAL_PATH:= $(call my-dir) ...@@ -31,7 +31,6 @@ LOCAL_PATH:= $(call my-dir)
$(info PWD=$(PWD)) $(info PWD=$(PWD))
$(info SFLPHONE_CONTRIB=$(SFLPHONE_CONTRIB)) $(info SFLPHONE_CONTRIB=$(SFLPHONE_CONTRIB))
$(info SFLPHONE_SRC=$(SFLPHONE_SRC))
$(info SFLPHONE_SRC_DIR=$(SFLPHONE_SRC_DIR)) $(info SFLPHONE_SRC_DIR=$(SFLPHONE_SRC_DIR))
$(info SFLPHONE_BUILD_DIR=$(SFLPHONE_BUILD_DIR)) $(info SFLPHONE_BUILD_DIR=$(SFLPHONE_BUILD_DIR))
...@@ -64,9 +63,9 @@ LOCAL_SRC_FILES := sflphone_wrapper.cpp ...@@ -64,9 +63,9 @@ LOCAL_SRC_FILES := sflphone_wrapper.cpp
# SFLPHONE_BUILD_DIR contains config.h, which we need # SFLPHONE_BUILD_DIR contains config.h, which we need
LOCAL_C_INCLUDES += $(LOCAL_PATH) \ LOCAL_C_INCLUDES += $(LOCAL_PATH) \
$(SFLPHONE_BUILD_DIR) \ $(SFLPHONE_BUILD_DIR) \
$(SFLPHONE_SRC)/daemon \ $(SFLPHONE_SRC_DIR)/daemon \
$(SFLPHONE_SRC)/daemon/src \ $(SFLPHONE_SRC_DIR)/daemon/src \
$(SFLPHONE_SRC)/daemon/contrib/$(TARGET_TUPLE)/include $(SFLPHONE_SRC_DIR)/daemon/contrib/$(TARGET_TUPLE)/include
LOCAL_MODULE := libsflphonejni LOCAL_MODULE := libsflphonejni
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment