From 95e1a6a56499b258ec40744b8e10fa9a14e4f8ab Mon Sep 17 00:00:00 2001
From: yejianwu <yejianwu@xiaomi.com>
Date: Tue, 31 Jul 2018 17:40:36 +0800
Subject: [PATCH] support ndk17

---
 docs/installation/env_requirement.rst | 5 +++--
 mace/benchmark/statistics.h           | 1 +
 mace/public/mace_runtime.h            | 1 +
 mace/utils/string_util.cc             | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/installation/env_requirement.rst b/docs/installation/env_requirement.rst
index 6946a524..fce26661 100644
--- a/docs/installation/env_requirement.rst
+++ b/docs/installation/env_requirement.rst
@@ -45,7 +45,7 @@ Optional dependencies
       - Remark
     * - Android NDK
       - `NDK installation guide <https://developer.android.com/ndk/guides/setup#install>`__
-      - Required by Android build, r15b, r15c, r16b
+      - Required by Android build, r15b, r15c, r16b, r17b
     * - ADB
       - apt-get install android-tools-adb
       - Required by Android run, >= 1.0.32
@@ -64,4 +64,5 @@ Optional dependencies
 
 .. note::
 
-    For Android build, `ANDROID_NDK_HOME` must be confifigured by using ``export ANDROID_NDK_HOME=/path/to/ndk``
+    - For Android build, `ANDROID_NDK_HOME` must be confifigured by using ``export ANDROID_NDK_HOME=/path/to/ndk``
+    - It will link ``libc++`` instead of ``libgnustl`` if NDK version not less than ``17``
diff --git a/mace/benchmark/statistics.h b/mace/benchmark/statistics.h
index 50ca901e..52f963e5 100644
--- a/mace/benchmark/statistics.h
+++ b/mace/benchmark/statistics.h
@@ -16,6 +16,7 @@
 #define MACE_BENCHMARK_STATISTICS_H_
 
 #include <algorithm>
+#include <cmath>
 #include <iomanip>
 #include <limits>
 #include <map>
diff --git a/mace/public/mace_runtime.h b/mace/public/mace_runtime.h
index 13ee9a52..12d3d974 100644
--- a/mace/public/mace_runtime.h
+++ b/mace/public/mace_runtime.h
@@ -57,6 +57,7 @@ class KVStorage {
   virtual const std::vector<unsigned char> *Find(const std::string &key) = 0;
   // return: 0 for success, -1 for error
   virtual int Flush() = 0;
+  virtual ~KVStorage() {}
 };
 
 class KVStorageFactory {
diff --git a/mace/utils/string_util.cc b/mace/utils/string_util.cc
index e41ba522..a873eb97 100644
--- a/mace/utils/string_util.cc
+++ b/mace/utils/string_util.cc
@@ -18,6 +18,7 @@
 #include <functional>
 #include <iomanip>
 #include <iostream>
+#include <numeric>
 #include <string>
 #include <sstream>
 #include <vector>
-- 
GitLab