diff --git a/WORKSPACE b/WORKSPACE
index e1a05fb596538f5055c67adf97236efba8692b6e..e62557bddf0cfa8a45ecd6fff10469524f4152ab 100644
--- a/WORKSPACE
+++ b/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"
-)
diff --git a/mace/BUILD b/mace/BUILD
index 59f97c0993fcf20f3503060a9edd736715db7833..a216f9f15e84ae3707fbaf13e1578dc510038bcb 100644
--- a/mace/BUILD
+++ b/mace/BUILD
@@ -74,3 +74,9 @@ cc_binary(
         ":mace_version_script.lds",
     ],
 )
+
+cc_library(
+  name = "libmace",
+  srcs = ["libmace.so"],
+  visibility = ["//visibility:public"],
+)
diff --git a/mace/benchmark/BUILD b/mace/benchmark/BUILD
index 2d8a08b1aa306ef2c83cfe400254705a5aefa1a4..b601a5d355ea6f9982e6935367f0a22377f50348 100644
--- a/mace/benchmark/BUILD
+++ b/mace/benchmark/BUILD
@@ -55,7 +55,7 @@ cc_binary(
         ":statistics",
         "//external:gflags_nothreads",
         "//mace/codegen:generated_mace_engine_factory",
-        "@libmace//:libmace",
+        "//mace:libmace",
     ],
 )
 
diff --git a/mace/tools/validation/BUILD b/mace/tools/validation/BUILD
index af4483899b2920409a6c3f13dd4c2efe5609e0e8..3e341220ddf49e3e611c326954bca78f017efa76 100644
--- a/mace/tools/validation/BUILD
+++ b/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",
     ],
 )
diff --git a/mace/tools/validation/libmace.BUILD b/mace/tools/validation/libmace.BUILD
deleted file mode 100644
index 9b28296968b0479097dfead638732fc2366614c1..0000000000000000000000000000000000000000
--- a/mace/tools/validation/libmace.BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-cc_library(
-  name = "libmace",
-  srcs = ["bazel-bin/mace/libmace.so"],
-  visibility = ["//visibility:public"],
-)
diff --git a/tools/sh_commands.py b/tools/sh_commands.py
index 42048d4d196a855df5d9a3f3e42f9c34896290ef..242c64bd21f2fc866c377254c01167e684f83d02 100644
--- a/tools/sh_commands.py
+++ b/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,