diff --git a/WORKSPACE b/WORKSPACE index b317f629..0fc42261 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -59,10 +59,10 @@ http_archive( urls = ["https://github.com/google/glog/archive/v0.4.0.tar.gz"], ) -new_local_repository( +http_archive( name = "com_google_ukey2", - path = "./third_party/ukey2/ukey2", - build_file_content = _ALL_CONTENT, + strip_prefix = "ukey2-master", + urls = ["https://github.com/google/ukey2/archive/master.zip"], ) http_archive( diff --git a/connections/implementation/BUILD b/connections/implementation/BUILD index fa928ef3..67bd965b 100644 --- a/connections/implementation/BUILD +++ b/connections/implementation/BUILD @@ -1,5 +1,3 @@ -load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake") - # Copyright 2020 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,28 +13,6 @@ load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake") # limitations under the License. licenses(["notice"]) -cmake( - name = "ukey2", - env = { - "CC": "clang", - "CXX": "clang++", - }, - generate_args = [ - "-DBYPASS_TESTING=ON", # Set the flags in CMakeLists.txt (ukey2 & its dependencies) here. - "-Dukey2_USE_LOCAL_ABSL=ON", - "-Dukey2_USE_LOCAL_PROTOBUF=ON", # Add -DCMAKE_BUILD_TYPE=Debug for debugger & Valgrind - ], - lib_source = "@com_google_ukey2//:all_srcs", - out_static_libs = [ - "libproto_device_to_device_messages_cc_proto.a", - "libproto_securegcm_cc_proto.a", - "libproto_securemessage_cc_proto.a", - "libproto_ukey_cc_proto.a", - "libsecuremessage.a", - "libukey2.a", - ], -) - cc_library( name = "internal", srcs = [ @@ -132,7 +108,6 @@ cc_library( ], deps = [ ":message_lite", - ":ukey2", "//connections:core_types", "//connections/implementation/analytics", "//connections/implementation/flags:connections_flags", @@ -165,6 +140,7 @@ cc_library( "@com_google_absl//absl/strings:str_format", "@com_google_absl//absl/time", "@com_google_absl//absl/types:span", + "@com_google_ukey2//:ukey2", ], ) @@ -243,7 +219,6 @@ cc_test( deps = [ ":internal", ":internal_test", - ":ukey2", "//connections:core_types", "//connections/implementation/flags:connections_flags", "//connections/implementation/mediums", @@ -267,5 +242,6 @@ cc_test( "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest", "@com_google_googletest//:gtest_main", + "@com_google_ukey2//:ukey2", ], )