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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
c22b175c
Commit
c22b175c
authored
12 years ago
by
Emeric Vigier
Browse files
Options
Downloads
Patches
Plain Diff
#14283: compile and use only shared expat library
parent
33b408c4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
jni/Application.mk
+1
-1
1 addition, 1 deletion
jni/Application.mk
jni/libdbus-c++-0.9.0-android/tools/Android.mk
+2
-4
2 additions, 4 deletions
jni/libdbus-c++-0.9.0-android/tools/Android.mk
with
3 additions
and
5 deletions
jni/Application.mk
+
1
−
1
View file @
c22b175c
...
...
@@ -3,7 +3,7 @@ APP_OPTIM := release
APP_MODULES
:=
libccgnu2
APP_MODULES
+=
libyaml
APP_MODULES
+=
libsamplerate
APP_MODULES
+=
libexpat_static
#
APP_MODULES += libexpat_static
APP_MODULES
+=
libexpat_shared
APP_MODULES
+=
libccrtp1
#APP_MODULES += libcutils-static
...
...
This diff is collapsed.
Click to expand it.
jni/libdbus-c++-0.9.0-android/tools/Android.mk
+
2
−
4
View file @
c22b175c
...
...
@@ -14,8 +14,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include \
# FIXME Android NDK cannot build host tool, android sources needed...
LOCAL_MODULE
:=
dbusxx-xml2cpp
LOCAL_CFLAGS
+=
-Wall
LOCAL_STATIC_LIBRARIES
+=
libexpat
LOCAL_LDFLAGS
+=
-lexpat
LOCAL_SHARED_LIBRARIES
+=
libexpat
include
$(BUILD_EXECUTABLE)
...
...
@@ -30,8 +29,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include
LOCAL_MODULE
:=
dbusxx-introspect
LOCAL_CFLAGS
+=
-Wall
LOCAL_STATIC_LIBRARIES
+=
libdbus-c++-1
LOCAL_LDFLAGS
+=
-ldbus-c
++-1
LOCAL_SHARED_LIBRARIES
+=
libdbus-c++-1
include
$(BUILD_EXECUTABLE)
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