aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2020-04-17 11:39:19 -0700
committerKenny Root <kroot@google.com>2020-05-01 10:26:35 -0700
commitfd0103e16208b9f6a876ae9153b06698128662e4 (patch)
tree4cfa9111c1cfb680adea56a0422d7cbfaa25865d
parented50ef80016ec5ec27fe9517109b1686c20b3172 (diff)
downloadgeneric-fd0103e16208b9f6a876ae9153b06698128662e4.tar.gz
Only one WORKSPACE in entire repo
This allows us to run bazel from anywhere in the nugget checkout and have it function correctly. Bug: 120442369 Test: bazel build ... Signed-off-by: Kenny Root <kroot@google.com> Change-Id: I0cc2404cc807df1a5d4b2128162c204ab07720ee
-rw-r--r--.gitignore1
-rw-r--r--WORKSPACE10
-rw-r--r--libnos/BUILD6
-rw-r--r--libnos/generator/BUILD2
-rw-r--r--libnos_transport/BUILD8
-rw-r--r--nugget/proto/BUILD22
6 files changed, 19 insertions, 30 deletions
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index a6ef824..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bazel-*
diff --git a/WORKSPACE b/WORKSPACE
deleted file mode 100644
index 094434b..0000000
--- a/WORKSPACE
+++ /dev/null
@@ -1,10 +0,0 @@
-workspace(name = "nugget_host_generic")
-
-local_repository(
- name = "nugget_bazelrules",
- path = "../../bazel_rules",
-)
-
-load("@nugget_bazelrules//:deps.bzl", "nugget_deps")
-
-nugget_deps("../..")
diff --git a/libnos/BUILD b/libnos/BUILD
index c74e2cd..c2c53c4 100644
--- a/libnos/BUILD
+++ b/libnos/BUILD
@@ -15,8 +15,8 @@ cc_library(
],
visibility = ["//visibility:public"],
deps = [
- "//:nos_headers",
- "//libnos_datagram",
- "//libnos_transport",
+ "//host/generic:nos_headers",
+ "//host/generic/libnos_datagram",
+ "//host/generic/libnos_transport",
],
)
diff --git a/libnos/generator/BUILD b/libnos/generator/BUILD
index 1cb4b3d..fc8bc33 100644
--- a/libnos/generator/BUILD
+++ b/libnos/generator/BUILD
@@ -8,7 +8,7 @@ cc_binary(
],
visibility = ["//visibility:public"],
deps = [
+ "//host/generic/nugget/proto:nugget_protobuf_options_cc_proto",
"@com_google_protobuf//:protoc_lib",
- "@nugget_host_generic//nugget/proto:nugget_protobuf_options_cc_proto",
],
)
diff --git a/libnos_transport/BUILD b/libnos_transport/BUILD
index 9db5a15..9fc9017 100644
--- a/libnos_transport/BUILD
+++ b/libnos_transport/BUILD
@@ -13,8 +13,8 @@ cc_library(
],
visibility = ["//visibility:public"],
deps = [
- "//:nos_headers",
- "//libnos_datagram",
+ "//host/generic:nos_headers",
+ "//host/generic/libnos_datagram",
],
)
@@ -25,12 +25,12 @@ cc_test(
],
copts = [
"-fsanitize=address",
- "-Ilibnos_transport",
+ "-Ihost/generic/libnos_transport",
],
linkopts = ["-fsanitize=address"],
deps = [
":libnos_transport",
- "//:nos_headers",
+ "//host/generic:nos_headers",
"@gtest",
],
)
diff --git a/nugget/proto/BUILD b/nugget/proto/BUILD
index 4d6729b..d065ed2 100644
--- a/nugget/proto/BUILD
+++ b/nugget/proto/BUILD
@@ -77,7 +77,7 @@ cc_library(
deps = [
"nugget_app_keymaster_keymaster_cc_proto",
"nugget_protobuf_options_cc_proto",
- "@nugget_host_generic//libnos",
+ "//host/generic/libnos",
],
)
@@ -96,7 +96,7 @@ cc_library(
deps = [
"nugget_app_weaver_weaver_cc_proto",
"nugget_protobuf_options_cc_proto",
- "@nugget_host_generic//libnos",
+ "//host/generic/libnos",
],
)
@@ -115,7 +115,7 @@ cc_library(
deps = [
"nugget_app_avb_avb_cc_proto",
"nugget_protobuf_options_cc_proto",
- "@nugget_host_generic//libnos",
+ "//host/generic/libnos",
],
)
@@ -123,7 +123,7 @@ cc_library(
# rpc proto genrules.
################################################################################
-GEN_SERVICE = "$(location @com_google_protobuf//:protoc) --plugin=protoc-gen-nos-client-cpp=$(location @nugget_host_generic//libnos/generator:protoc_gen_nos_client_cpp)"
+GEN_SERVICE = "$(location @com_google_protobuf//:protoc) --plugin=protoc-gen-nos-client-cpp=$(location //host/generic/libnos/generator:protoc_gen_nos_client_cpp)"
PROTO_ROOT = "$$(dirname $$(dirname $$(dirname $(location nugget/protobuf/options.proto))))"
@@ -141,8 +141,8 @@ genrule(
" --nos-client-cpp_out=source:$$(dirname $(location nugget/app/avb/Avb.client.cpp)) " +
"$(location nugget/app/avb/avb.proto)",
tools = [
+ "//host/generic/libnos/generator:protoc_gen_nos_client_cpp",
"@com_google_protobuf//:protoc",
- "@nugget_host_generic//libnos/generator:protoc_gen_nos_client_cpp",
],
)
@@ -160,8 +160,8 @@ genrule(
" --nos-client-cpp_out=header:$$(dirname $(location nugget/app/avb/Avb.client.h)) " +
"$(location nugget/app/avb/avb.proto)",
tools = [
+ "//host/generic/libnos/generator:protoc_gen_nos_client_cpp",
"@com_google_protobuf//:protoc",
- "@nugget_host_generic//libnos/generator:protoc_gen_nos_client_cpp",
],
)
@@ -179,8 +179,8 @@ genrule(
" --nos-client-cpp_out=source:$$(dirname $(location nugget/app/weaver/Weaver.client.cpp)) " +
"$(location nugget/app/weaver/weaver.proto)",
tools = [
+ "//host/generic/libnos/generator:protoc_gen_nos_client_cpp",
"@com_google_protobuf//:protoc",
- "@nugget_host_generic//libnos/generator:protoc_gen_nos_client_cpp",
],
)
@@ -198,8 +198,8 @@ genrule(
" --nos-client-cpp_out=header:$$(dirname $(location nugget/app/weaver/Weaver.client.h)) " +
"$(location nugget/app/weaver/weaver.proto)",
tools = [
+ "//host/generic/libnos/generator:protoc_gen_nos_client_cpp",
"@com_google_protobuf//:protoc",
- "@nugget_host_generic//libnos/generator:protoc_gen_nos_client_cpp",
],
)
@@ -219,8 +219,8 @@ genrule(
" --nos-client-cpp_out=source:$$(dirname $(location nugget/app/keymaster/Keymaster.client.cpp)) " +
"$(location nugget/app/keymaster/keymaster.proto)",
tools = [
+ "//host/generic/libnos/generator:protoc_gen_nos_client_cpp",
"@com_google_protobuf//:protoc",
- "@nugget_host_generic//libnos/generator:protoc_gen_nos_client_cpp",
],
)
@@ -240,8 +240,8 @@ genrule(
" --nos-client-cpp_out=header:$$(dirname $(location nugget/app/keymaster/Keymaster.client.h)) " +
"$(location nugget/app/keymaster/keymaster.proto)",
tools = [
+ "//host/generic/libnos/generator:protoc_gen_nos_client_cpp",
"@com_google_protobuf//:protoc",
- "@nugget_host_generic//libnos/generator:protoc_gen_nos_client_cpp",
],
)
@@ -249,7 +249,7 @@ genrule(
# proto libraries
################################################################################
-PROTO_SOURCE_ROOT = "/nugget/proto"
+PROTO_SOURCE_ROOT = "/host/generic/nugget/proto"
proto_library(
name = "google_protobuf_descriptor_proto",