Merge pull request #648 from splasky/647

fix(endpoint): Revise endpoint build targets in favor of Bazel

Author: jserv

.gitmodules

@@ -7,9 +7,3 @@
 [submodule "third_party/mosquitto"]
 	path = third_party/mosquitto
 	url = https://github.com/eclipse/mosquitto.git
-[submodule "third_party/http-parser"]
-	path = third_party/http-parser
-	url = https://github.com/nodejs/http-parser.git
-[submodule "third_party/mbedtls"]
-	path = third_party/mbedtls
-	url = https://github.com/ARMmbed/mbedtls.git

Makefile

@@ -2,12 +2,8 @@ DCURL_DIR := third_party/dcurl
 DCURL_LIB := $(DCURL_DIR)/build/libdcurl.so
 MOSQUITTO_DIR := third_party/mosquitto
 MOSQUITTO_LIB := $(MOSQUITTO_DIR)/lib/libmosquitto.so.1
-MBEDTLS_DIR := third_party/mbedtls
-MBEDTLS_LIB := $(MBEDTLS_PATH)/library/libmbedx509.so $(MBEDTLS_PATH)/library/libmbedtls.so $(MBEDTLS_PATH)/library/libmbedcrypto.so
-HTTPPARSER_DIR := third_party/http-parser
-HTTPPARSER_LIB := $(HTTPPARSER_DIR)/libhttp_parser.so
 PEM_DIR = pem
-DEPS += $(DCURL_LIB) $(HTTPPARSER_LIB) $(MBEDTLS_LIB)
+DEPS += $(DCURL_LIB)
 PEM := $(PEM_DIR)/cert.pem
 
 all: $(DEPS) cert
@@ -27,14 +23,6 @@ $(MOSQUITTO_LIB): $(MOSQUITTO_DIR)
 	@echo
 	$(MAKE) -C $^ WITH_DOCS=no
 
-$(HTTPPARSER_LIB): $(HTTPPARSER_DIR)
-	git submodule update --init $^
-	$(MAKE) -C $^ library
-
-$(MBEDTLS_LIB): $(MBEDTLS_DIR)
-	git submodule update --init $^
-	$(MAKE) -C $^ SHARED=1 lib
-
 cert: check_pem
 	@xxd -i $(PEM) > $(PEM_DIR)/ca_crt.inc
 	@sed -E \
@@ -52,9 +40,6 @@ endif
 clean:
 	$(MAKE) -C $(DCURL_DIR) clean
 	$(MAKE) -C $(MOSQUITTO_DIR) clean
-	$(MAKE) -C $(HTTPPARSER_DIR) clean
-	$(MAKE) -C $(MBEDTLS_DIR) clean
-
 
 distclean: clean
 	$(RM) -r $(DCURL_DIR)

WORKSPACE

@@ -25,6 +25,13 @@ git_repository(
     tag = "v0.9.0",
 )
 
+new_git_repository(
+    name = "mbedtls_2_16_6",
+    build_file = "//third_party:mbedtls.BUILD",
+    remote = "https://github.com/ARMmbed/mbedtls.git",
+    tag = "mbedtls-2.16.6",
+)
+
 load("@rules_iota//:defs.bzl", "iota_deps")
 load("@io_bazel_rules_docker//repositories:repositories.bzl", container_repositories = "repositories")
 

third_party/BUILD

@@ -18,17 +18,3 @@ cc_library(
         "mosquitto/lib/mqtt_protocol.h",
     ],
 )
-
-cc_library(
-    name = "http-parser",
-    srcs = glob(["http-parser/*.so.*"]),
-    hdrs = ["http-parser/http_parser.h"],
-    includes = ["http-parser"],
-)
-
-cc_library(
-    name = "mbedtls",
-    srcs = glob(["mbedtls/library/*.so.*"]),
-    hdrs = glob(["mbedtls/include/mbedtls/*.h"]) + glob(["mbedtls/include/psa/*.h"]),
-    includes = ["mbedtls/include"],
-)

third_party/http-parser

@@ -0,0 +1,8 @@
+cc_library(
+    name = "mbedtls_2_16_6",
+    srcs = glob(["library/*.c"]),
+    hdrs = glob(["include/mbedtls/*.h"]) + glob(["include/psa/*.h"]),
+    include_prefix = "mbedtls",
+    strip_include_prefix = "include/mbedtls",
+    visibility = ["//visibility:public"],
+)

third_party/mbedtls

@@ -50,7 +50,7 @@ cc_library(
     hdrs = ["cipher.h"],
     deps = [
         "//common:ta_errors",
-        "//third_party:mbedtls",
+        "@mbedtls_2_16_6",
     ],
 )
 

third_party/mbedtls.BUILD

@@ -9,7 +9,7 @@ cc_library(
     deps = [
         "//common",
         "//pem:cert",
-        "//third_party:http-parser",
-        "//third_party:mbedtls",
+        "@http_parser",
+        "@mbedtls_2_16_6",
     ],
 )