aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/config.android2
-rw-r--r--config/config.mk1
-rw-r--r--config/modules/109-libhicn.mk1
-rw-r--r--config/modules/610-libdash.mk2
4 files changed, 4 insertions, 2 deletions
diff --git a/config/config.android b/config/config.android
index 9383d049..ee531cab 100644
--- a/config/config.android
+++ b/config/config.android
@@ -9,7 +9,7 @@
#
set(ANDROID_NDK_VERSION "android-ndk-r13b")
-set(ANDROID_API_VERSION "android-23")
+set(ANDROID_API_VERSION "android-24")
set(ANDROID_TOOLCHAIN "arm-linux-androideabi")
set(ANDROID_TOOLCHAIN_VERSION "${ANDROID_TOOLCHAIN}-4.9")
set(ANDROID_API "${ANDROID_API_VERSION}")
diff --git a/config/config.mk b/config/config.mk
index 808ffc1a..af30b3f0 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -106,3 +106,4 @@ export QT_HOME=${DISTILLERY_ROOT_DIR}/qt/Qt
export ANDROID_ARCH=armv7
export DISTILLERY_BUILD_DIR
export DISTILLERY_INSTALL_DIR
+export ANDROID_PLATFORM=android-23
diff --git a/config/modules/109-libhicn.mk b/config/modules/109-libhicn.mk
new file mode 100644
index 00000000..7c947e22
--- /dev/null
+++ b/config/modules/109-libhicn.mk
@@ -0,0 +1 @@
+$(eval $(call addCMakeModule,libhicn))
diff --git a/config/modules/610-libdash.mk b/config/modules/610-libdash.mk
index 9c697abb..35163d4d 100644
--- a/config/modules/610-libdash.mk
+++ b/config/modules/610-libdash.mk
@@ -1 +1 @@
-$(eval $(call addCMakeModule,libdash))
+$(eval $(call addCMakeModule,viper/libdash))