From 0829af5ba962dbb2943d667dbef27e3f9d894c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Isnard?= Date: Fri, 8 Mar 2019 14:19:05 +0100 Subject: [PATCH 1/3] Bump requirements.lock to get API 19 conan profiles --- requirements.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.lock b/requirements.lock index eb1691b..6de344f 100644 --- a/requirements.lock +++ b/requirements.lock @@ -1,5 +1,5 @@ # Generated with dmenv 0.11.0, python 3.7.2+, on Linux --e git+ssh://git@tanker.local/Tanker/ci@d74efd7ac6bf2383788cec6b011dd80bc8fa145c#egg=ci +-e git+ssh://git@tanker.local/Tanker/ci@7b3969f43f7206fa9a3078ae334134e5049d3bb0#egg=ci astroid==2.0.4 attrs==19.1.0 bottle==0.12.13 From e0fb48452b6e7ce19127edb3562761a11954562a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Isnard?= Date: Mon, 11 Mar 2019 15:16:51 +0100 Subject: [PATCH 2/3] Change min SDK version to 19 --- tanker-bindings/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tanker-bindings/build.gradle b/tanker-bindings/build.gradle index 10bee61..868189f 100644 --- a/tanker-bindings/build.gradle +++ b/tanker-bindings/build.gradle @@ -12,7 +12,7 @@ version 'dev' android { compileSdkVersion 28 defaultConfig { - minSdkVersion 21 + minSdkVersion 19 targetSdkVersion 28 ndk { From 6703b8f22622e8f29b08ac0041b20fb5a5d9331b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Isnard?= Date: Mon, 11 Mar 2019 16:26:31 +0100 Subject: [PATCH 3/3] Restore missing gradle script to build libtanker-bindings-jni.so Seems to have disappeared in the recent gradle cleanups. --- tanker-bindings/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tanker-bindings/build.gradle b/tanker-bindings/build.gradle index 868189f..d759f54 100644 --- a/tanker-bindings/build.gradle +++ b/tanker-bindings/build.gradle @@ -32,6 +32,11 @@ android { } } } + externalNativeBuild { + cmake { + path 'CMakeLists.txt' + } + } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8