Merge branch 'support_libcpp_in_ndk17' into 'master'

support ndk17

See merge request !696

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``

mace/benchmark/statistics.h

@@ -16,6 +16,7 @@
 #define MACE_BENCHMARK_STATISTICS_H_
 
 #include <algorithm>
+#include <cmath>
 #include <iomanip>
 #include <limits>
 #include <map>

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 {

mace/utils/string_util.cc

@@ -18,6 +18,7 @@
 #include <functional>
 #include <iomanip>
 #include <iostream>
+#include <numeric>
 #include <string>
 #include <sstream>
 #include <vector>