From f552702f7a3903d2b7e67fd1a26a50e8099caeab Mon Sep 17 00:00:00 2001
From: yejianwu <yejianwu@xiaomi.com>
Date: Thu, 14 Jun 2018 19:38:09 +0800
Subject: [PATCH] update so path

---
 WORKSPACE                           | 6 ------
 mace/BUILD                          | 6 ++++++
 mace/benchmark/BUILD                | 2 +-
 mace/tools/validation/BUILD         | 2 +-
 mace/tools/validation/libmace.BUILD | 5 -----
 tools/sh_commands.py                | 8 +++++---
 6 files changed, 13 insertions(+), 16 deletions(-)
 delete mode 100644 mace/tools/validation/libmace.BUILD

diff --git a/WORKSPACE b/WORKSPACE
index e1a05fb5..e62557bd 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 59f97c09..a216f9f1 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 2d8a08b1..b601a5d3 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 af448389..3e341220 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 9b282969..00000000
--- 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 42048d4d..242c64bd 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,
-- 
GitLab