aboutsummaryrefslogtreecommitdiffstats
path: root/libnos
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-08 16:54:43 -0700
committerXin Li <delphij@google.com>2020-09-08 16:54:43 -0700
commit57492c61c8800771330363cd5bf63a6c3b263290 (patch)
tree0904b9f712d8d0fc62470c89576cb0c0444ce406 /libnos
parentc800e75b5615881f130a7cb356e281966fa67671 (diff)
parenta21d9de13958fd04376f1dbc2aa945d2df625a90 (diff)
downloadplatform_external_nos_host_generic-master.tar.gz
platform_external_nos_host_generic-master.tar.bz2
platform_external_nos_host_generic-master.zip
Merge Android RHEADmaster
Bug: 168057903 Merged-In: If0f3baab4f54614b6890d8419f6ca8c1b59ba1de Change-Id: I24501de7efea9f33add1ada8a2dd5c2bcf98ca7e
Diffstat (limited to 'libnos')
-rw-r--r--libnos/BUILD12
-rw-r--r--libnos/NuggetClient.cpp3
-rw-r--r--libnos/WORKSPACE1
-rw-r--r--libnos/generator/BUILD2
-rw-r--r--libnos/generator/WORKSPACE1
-rw-r--r--libnos/include/nos/NuggetClient.h1
6 files changed, 11 insertions, 9 deletions
diff --git a/libnos/BUILD b/libnos/BUILD
index edb46d5..c2c53c4 100644
--- a/libnos/BUILD
+++ b/libnos/BUILD
@@ -1,22 +1,22 @@
cc_library(
name = "libnos",
srcs = [
- "debug.cpp",
"NuggetClient.cpp",
+ "debug.cpp",
],
hdrs = [
- "include/nos/debug.h",
"include/nos/AppClient.h",
"include/nos/NuggetClient.h",
"include/nos/NuggetClientInterface.h",
+ "include/nos/debug.h",
],
includes = [
- "./include",
+ "include",
],
visibility = ["//visibility:public"],
deps = [
- "@nugget_host_generic//:nos_headers",
- "@nugget_host_generic_libnos_datagram//:libnos_datagram",
- "@nugget_host_generic_libnos_transport//:libnos_transport",
+ "//host/generic:nos_headers",
+ "//host/generic/libnos_datagram",
+ "//host/generic/libnos_transport",
],
)
diff --git a/libnos/NuggetClient.cpp b/libnos/NuggetClient.cpp
index f775756..3f4682d 100644
--- a/libnos/NuggetClient.cpp
+++ b/libnos/NuggetClient.cpp
@@ -32,6 +32,9 @@ NuggetClient::NuggetClient(const std::string& device_name)
: device_name_(device_name), open_(false) {
}
+NuggetClient::NuggetClient(const char* device_name)
+ : device_name_(device_name ? device_name : ""), open_(false) {}
+
NuggetClient::~NuggetClient() {
Close();
}
diff --git a/libnos/WORKSPACE b/libnos/WORKSPACE
deleted file mode 100644
index 40ed97b..0000000
--- a/libnos/WORKSPACE
+++ /dev/null
@@ -1 +0,0 @@
-workspace(name = "nugget_host_generic_libnos")
diff --git a/libnos/generator/BUILD b/libnos/generator/BUILD
index 3499d07..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/generator/WORKSPACE b/libnos/generator/WORKSPACE
deleted file mode 100644
index fc361c0..0000000
--- a/libnos/generator/WORKSPACE
+++ /dev/null
@@ -1 +0,0 @@
-workspace(name = "nugget_host_generic_libnos_generator")
diff --git a/libnos/include/nos/NuggetClient.h b/libnos/include/nos/NuggetClient.h
index 428b0c3..f79b168 100644
--- a/libnos/include/nos/NuggetClient.h
+++ b/libnos/include/nos/NuggetClient.h
@@ -42,6 +42,7 @@ public:
* Passing an empty device name causes the default device to be selected.
*/
NuggetClient(const std::string& device_name);
+ NuggetClient(const char* device_name);
~NuggetClient() override;