Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
47b6aaaf
Commit
47b6aaaf
authored
Oct 17, 2014
by
Alexandre Lision
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+0
-1
0 additions, 1 deletion
Makefile
sflphone-android/jni/Android.mk
+3
-4
3 additions, 4 deletions
sflphone-android/jni/Android.mk
with
3 additions
and
5 deletions
Makefile
+
0
−
1
View file @
47b6aaaf
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
sflphone-android/jni/Android.mk
+
3
−
4
View file @
47b6aaaf
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment