diff options
| author |   Angelo Mantellini <angelo.mantellini@irt-systemx.fr> | 2018-03-21 14:16:02 +0100 |
|---|---|---|
| committer | Angelo Mantellini <angelo.mantellini@irt-systemx.fr> | 2018-03-21 20:46:00 +0100 |
| commit | 5d308865d0783d0cd70f7453c77980835ac5648e (patch) | |
| tree | aea91e7109a81669e5b19443296cf1dec6876532 /config/modules | |
| parent | e90a1ec7c82519127b63931a96535ad4bc31342d (diff) | |
update android-sdk. Now it is possible to compile with clangandroid-sdk/master
Change-Id: I156aa48dd90467a2a7540eec11839c0111b13bd2
Signed-off-by: Angelo Mantellini <angelo.mantellini@irt-systemx.fr>
Diffstat (limited to 'config/modules')
| -rw-r--r-- | config/modules/002-cmake-modules.mk | 19 | ||||
| -rw-r--r-- | config/modules/106-jsoncpp.mk | 1 | ||||
| -rw-r--r-- | config/modules/107-libevent.mk | 1 | ||||
| -rw-r--r-- | config/modules/108-libxml2.mk | 1 | ||||
| -rw-r--r-- | config/modules/109-libhicn.mk | 1 | ||||
| -rw-r--r-- | config/modules/510-forwarder.mk (renamed from config/modules/510-Metis.mk) | 0 | ||||
| -rw-r--r-- | config/modules/710-http-server.mk | 1 |
7 files changed, 15 insertions, 9 deletions
diff --git a/config/modules/002-cmake-modules.mk b/config/modules/002-cmake-modules.mk index 3378443c..f713af8f 100644 --- a/config/modules/002-cmake-modules.mk +++ b/config/modules/002-cmake-modules.mk @@ -45,14 +45,17 @@ $(eval $1_XCODE_DIR?=${DISTILLERY_XCODE_DIR}/$1) $(eval modules_xcode+=$1) ${$1_BUILD_DIR}/Makefile: ${$1_SOURCE_DIR}/CMakeLists.txt ${DISTILLERY_STAMP} - mkdir -p ${$1_BUILD_DIR} - cd ${$1_BUILD_DIR}; \ - DEPENDENCY_HOME=${DISTILLERY_EXTERN_DIR} \ - ${CMAKE}/cmake ${$1_SOURCE_DIR} \ - -DOPENSSL_ROOT_DIR=OPEN_SSL_DIR \ - ${CMAKE_BUILD_TYPE_FLAG} \ - ${CCNX_COMPILE_ENVIRONMENT} \ - -DCMAKE_INSTALL_PREFIX=${DISTILLERY_INSTALL_DIR} + mkdir -p ${$1_BUILD_DIR}; + echo ${$1_BUILD_DIR}; + cd ${$1_BUILD_DIR}; \ + DEPENDENCY_HOME=${DISTILLERY_EXTERN_DIR} \ + cmake -DCMAKE_TOOLCHAIN_FILE=${NDK}/build/cmake/android.toolchain.cmake \ + -DANDROID_TOOLCHAIN=clang \ + -DANDROID_ABI=${ANDROID_ABI} \ + -DCMAKE_FIND_ROOT_PATH=${DISTILLERY_INSTALL_DIR} \ + -DANDROID_NATIVE_API_LEVEL=26 -DANDROID_API=ON -DINSTALL_HEADER=ON -DHAVE_FSETXATTR=OFF -DHAVE_GLIBC_STRERROR_R=OFF \ + -DICNET=ON -DCMAKE_INSTALL_PREFIX=${DISTILLERY_INSTALL_DIR} ${$1_SOURCE_DIR} -DBUILD_SHARED_LIBS=0 + ${$1_SOURCE_DIR}/CMakeLists.txt: @echo "**option **1" diff --git a/config/modules/106-jsoncpp.mk b/config/modules/106-jsoncpp.mk new file mode 100644 index 00000000..b8c1ef33 --- /dev/null +++ b/config/modules/106-jsoncpp.mk @@ -0,0 +1 @@ +$(eval $(call addCMakeModule,jsoncpp)) diff --git a/config/modules/107-libevent.mk b/config/modules/107-libevent.mk new file mode 100644 index 00000000..a3ee3251 --- /dev/null +++ b/config/modules/107-libevent.mk @@ -0,0 +1 @@ +$(eval $(call addCMakeModule,libevent)) diff --git a/config/modules/108-libxml2.mk b/config/modules/108-libxml2.mk new file mode 100644 index 00000000..09fec5bb --- /dev/null +++ b/config/modules/108-libxml2.mk @@ -0,0 +1 @@ +$(eval $(call addCMakeModule,libxml2)) diff --git a/config/modules/109-libhicn.mk b/config/modules/109-libhicn.mk deleted file mode 100644 index 7c947e22..00000000 --- a/config/modules/109-libhicn.mk +++ /dev/null @@ -1 +0,0 @@ -$(eval $(call addCMakeModule,libhicn)) diff --git a/config/modules/510-Metis.mk b/config/modules/510-forwarder.mk index ba11067e..ba11067e 100644 --- a/config/modules/510-Metis.mk +++ b/config/modules/510-forwarder.mk diff --git a/config/modules/710-http-server.mk b/config/modules/710-http-server.mk new file mode 100644 index 00000000..abf5500a --- /dev/null +++ b/config/modules/710-http-server.mk @@ -0,0 +1 @@ +$(eval $(call addCMakeModule,http-server)) |