Skip to content

Commit

Permalink
Android - LZ4 Fix (#84)
Browse files Browse the repository at this point in the history
* Integrated Android in Travis CI

* Integrated Android in Travis CI #2

* Integrated Android in Travis CI #3

* Updated android mpb file

* Travis update for Android #2

* Travis Update for Android #3

* Travis Android update fix #4

* Update using_android.mpb

* SSL Build fix for Android

* Delete automation_tests.sh

Automation tests file no longer needed.

* LZ4 issue fix for Android
  • Loading branch information
amsurana authored and jredmondson committed Sep 19, 2018
1 parent c562a0e commit 8933de3
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions using_android.mpb
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
feature (android) {

includes += $(BOOST_ANDROID_ROOT)/build/$(ANDROID_ARCH)/include
includes += $(LZ4_ROOT)/lib
libpaths += $(BOOST_ANDROID_ROOT)/build/$(ANDROID_ARCH)/lib

verbatim (make, local, true) {
SYSROOT = $(NDK_TOOLS)/sysroot

LDLIBS = -l:libboost_system.a -l:libboost_filesystem.a -llog -lc++_shared -lcapnp-0.6.1 -lcapnpc-0.6.1 -lcapnp-json-0.6.1 -lkj-0.6.1

ifeq ($(LZ4),1)
LDLIBS +=-llz4
LDFLAGS+= -L$(LZ4_ROOT)/lib
endif

ifeq ($(ZMQ),1)
LDLIBS +=-lzmq
Expand Down Expand Up @@ -35,11 +40,5 @@ feature (android) {
CXX = $(NDK_TOOLS)/bin/$(CROSS_COMPILE)clang++
CC = $(NDK_TOOLS)/bin/$(CROSS_COMPILE)clang
}







}

0 comments on commit 8933de3

Please sign in to comment.