update so path

WORKSPACE

@@ -123,9 +123,3 @@ android_ndk_repository(
     # Android 5.0
     api_level = 21,
 )
-
-new_local_repository(
-    name = "libmace",
-    path = "./",
-    build_file = "./mace/tools/validation/libmace.BUILD"
-)

mace/BUILD

@@ -74,3 +74,9 @@ cc_binary(
         ":mace_version_script.lds",
     ],
 )
+
+cc_library(
+  name = "libmace",
+  srcs = ["libmace.so"],
+  visibility = ["//visibility:public"],
+)

mace/benchmark/BUILD

@@ -55,7 +55,7 @@ cc_binary(
         ":statistics",
         "//external:gflags_nothreads",
         "//mace/codegen:generated_mace_engine_factory",
-        "@libmace//:libmace",
+        "//mace:libmace",
     ],
 )
 

mace/tools/validation/BUILD

@@ -34,6 +34,6 @@ cc_binary(
         "//external:gflags_nothreads",
         "//mace/codegen:generated_mace_engine_factory",
         "//mace/utils:utils",
-        "@libmace//:libmace",
+        "//mace:libmace",
     ],
 )

mace/tools/validation/libmace.BUILD

-cc_library(
-  name = "libmace",
-  srcs = ["bazel-bin/mace/libmace.so"],
-  visibility = ["//visibility:public"],
-)

tools/sh_commands.py

@@ -596,12 +596,10 @@ def update_libmace_shared_library(serial_num,
                                   project_name,
                                   build_output_dir,
                                   library_output_dir):
-    libmace_name = "libmace.so"
     library_dir = "%s/%s/%s/%s" % (
             build_output_dir, project_name, library_output_dir, abi)
-    libmace_file = "%s/%s" % (library_dir, libmace_name)
 
-    if os.path.exists(libmace_file):
+    if os.path.exists(library_dir):
         sh.rm("-rf", library_dir)
     sh.mkdir("-p", library_dir)
     sh.cp("-f", "bazel-bin/mace/libmace.so", library_dir)
@@ -610,6 +608,10 @@ def update_libmace_shared_library(serial_num,
           (os.environ["ANDROID_NDK"], abi),
           library_dir)
 
+    if os.path.exists("mace/libmace.so"):
+        sh.rm("-f", "mace/libmace.so")
+    sh.cp("-f", "bazel-bin/mace/libmace.so", "mace/")
+
 
 def tuning_run(abi,
                serialno,