Bazel: osqp & qpOASES

WORKSPACE

@@ -155,19 +155,6 @@ new_local_repository(
 #    path = "/opt/apollo/pkgs/caffe/include",
 # )
 
-new_local_repository(
-    name = "qpOASES",
-    build_file = "third_party/qpOASES.BUILD",
-    path = "/opt/apollo/sysroot/include",
-)
-
-# OSQP
-new_local_repository(
-    name = "osqp",
-    build_file = "third_party/osqp.BUILD",
-    path = "/opt/apollo/sysroot/include",
-)
-
 # ipopt
 new_local_repository(
     name = "ipopt",

third_party/osqp/BUILD

+package(
+    default_visibility = ["//visibility:public"],
+)

third_party/osqp/workspace.bzl

+"""Loads the osqp library"""
+
+# Sanitize a dependency so that it works correctly from code that includes
+# Apollo as a submodule.
+def clean_dep(dep):
+    return str(Label(dep))
+
+def repo():
+    native.new_local_repository(
+        name = "osqp",
+        build_file = clean_dep("//third_party/osqp:osqp.BUILD"),
+        path = "/opt/apollo/sysroot/include",
+    )

third_party/qpOASES/BUILD

+package(
+    default_visibility = ["//visibility:public"],
+)

third_party/qpOASES/workspace.bzl

+"""Loads the qpOASES library"""
+
+# Sanitize a dependency so that it works correctly from code that includes
+# Apollo as a submodule.
+def clean_dep(dep):
+    return str(Label(dep))
+
+def repo():
+    native.new_local_repository(
+        name = "qpOASES",
+        build_file = clean_dep("//third_party/qpOASES:qpOASES.BUILD"),
+        path = "/opt/apollo/sysroot/include",
+    )

tools/workspace.bzl

@@ -10,9 +10,11 @@ load("//third_party/glog:workspace.bzl", glog = "repo")
 load("//third_party/lz4:workspace.bzl", lz4 = "repo")
 load("//third_party/npp:workspace.bzl", npp = "repo")
 load("//third_party/opencv:workspace.bzl", opencv = "repo")
+load("//third_party/osqp:workspace.bzl", osqp = "repo")
 load("//third_party/pcl:workspace.bzl", pcl = "repo")
 load("//third_party/poco:workspace.bzl", poco = "repo")
 load("//third_party/proj4:workspace.bzl", proj4 = "repo")
+load("//third_party/qpOASES:workspace.bzl", qpOASES = "repo")
 load("//third_party/tf2:workspace.bzl", tf2 = "repo")
 load("//third_party/tinyxml2:workspace.bzl", tinyxml2 = "repo")
 load("//third_party/yaml_cpp:workspace.bzl", yaml_cpp = "repo")
@@ -30,9 +32,11 @@ def initialize_third_party():
     lz4()
     npp()
     opencv()
+    osqp()
     pcl()
     poco()
     proj4()
+    qpOASES()
     tf2()
     tinyxml2()
     yaml_cpp()