Use the //c-toxcore public BUILD target.

TokTok · Jan 22, 2018 · 15c4251 · 15c4251
1 parent 76ba3a9
commit 15c4251
Showing 1 changed file with 10 additions and 20 deletions.
diff --git a/BUILD b/BUILD
@@ -29,8 +29,14 @@ cc_proto_library(
     deps = [":jni_proto"],
 )
 
-cc_library(
-    name = "jni_lib",
+scalapb_proto_library(
+    name = "jni_scala_proto",
+    with_flat_package = True,
+    deps = [":jni_proto"],
+)
+
+cc_binary(
+    name = "libtox4j-c.so",
     srcs = glob([
         "cpp/src/**/*.cpp",
         "cpp/src/**/*.h",
@@ -49,32 +55,16 @@ cc_library(
         "cpp/src",
         "src/main/protobuf",
     ],
-    deps = [
-        ":jni_cc_proto",
-        "//c-toxcore:headers",
-        "//c-toxcore/toxav",
-        "//c-toxcore/toxcore",
-        "//c-toxcore/toxencryptsave",
-    ],
-)
-
-cc_binary(
-    name = "libtox4j-c.so",
     linkopts = ["-Wl,--version-script,$(location cpp/src/libtox4j-c.ld)"],
     linkshared = True,
     visibility = ["//visibility:public"],
     deps = [
         "cpp/src/libtox4j-c.ld",
-        ":jni_lib",
+        ":jni_cc_proto",
+        "//c-toxcore",
     ],
 )
 
-scalapb_proto_library(
-    name = "jni_scala_proto",
-    with_flat_package = True,
-    deps = [":jni_proto"],
-)
-
 scala_library(
     name = "jvm-toxcore-c",
     srcs = glob([