Merge branch 'fix_crash_when_using_libmace.so' into 'master'

fix crash when using libmace.so

See merge request !851

mace/benchmark/BUILD

@@ -60,7 +60,7 @@ cc_binary(
         "-pie",
         "-llog",
     ]),
-    linkstatic = 1,
+    linkstatic = 0,
     deps = [
         ":statistics",
         "//external:gflags_nothreads",

mace/examples/cli/BUILD

@@ -52,7 +52,7 @@ cc_binary(
         "-pie",
         "-llog",
     ]),
-    linkstatic = 1,
+    linkstatic = 0,
     deps = [
         "//external:gflags_nothreads",
         "//mace/codegen:generated_mace_engine_factory",

mace/libmace/BUILD

@@ -55,7 +55,7 @@ cc_binary(
         "-fopenmp",
     ]),
     linkshared = 1,
-    linkstatic = 1,
+    linkstatic = 0,
     deps = [
         "//mace/libmace:mace_version_script.lds",
         "//mace/libmace",

mace/tools/validation/BUILD

@@ -38,7 +38,7 @@ cc_binary(
         "-pie",
         "-llog",
     ]),
-    linkstatic = 1,
+    linkstatic = 0,
     deps = [
         "//external:gflags_nothreads",
         "//mace/codegen:generated_mace_engine_factory",

tools/sh_commands.py

@@ -678,6 +678,25 @@ def create_internal_storage_dir(serialno, phone_data_dir):
     return internal_storage_dir
 
 
+def push_depended_so_libs(libmace_dynamic_library_path,
+                          abi, phone_data_dir, serialno):
+    dep_so_libs = sh.bash("/opt/android-ndk/ndk-depends",
+                          libmace_dynamic_library_path)
+    for dep in split_stdout(dep_so_libs):
+        if dep == "libgnustl_shared.so":
+            adb_push(
+                    "%s/sources/cxx-stl/gnu-libstdc++/4.9/libs/%s/libgnustl_shared.so"  # noqa
+                    % (os.environ["ANDROID_NDK_HOME"], abi),
+                    phone_data_dir,
+                    serialno)
+        elif dep == "libc++_shared.so":
+            adb_push(
+                    "%s/sources/cxx-stl/llvm-libc++/libs/%s/libc++_shared.so"  # noqa
+                    % (os.environ["ANDROID_NDK_HOME"], abi),
+                    phone_data_dir,
+                    serialno)
+
+
 def tuning_run(abi,
                serialno,
                target_dir,
@@ -802,6 +821,8 @@ def tuning_run(abi,
         if link_dynamic:
             adb_push(libmace_dynamic_library_path, phone_data_dir,
                      serialno)
+            push_depended_so_libs(libmace_dynamic_library_path, abi,
+                                  phone_data_dir, serialno)
 
         adb_push("%s/%s" % (target_dir, target_name), phone_data_dir,
                  serialno)
@@ -1127,6 +1148,9 @@ def benchmark_model(abi,
         if link_dynamic:
             adb_push(libmace_dynamic_library_path, phone_data_dir,
                      serialno)
+            push_depended_so_lib(libmace_dynamic_library_path, abi,
+                                 phone_data_dir, serialno)
+
         adb_push("%s/%s" % (benchmark_binary_dir, benchmark_binary_name),
                  phone_data_dir,
                  serialno)