summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin (Kun) "Kassimo" Qian <kevinkassimo@gmail.com>2018-09-16 18:09:02 -0700
committerBert Belder <bertbelder@gmail.com>2018-09-16 18:38:41 -0700
commit0185f9f9de3d0a65f1ce463e479d5069eabe3c96 (patch)
treeb6839c5514f6bbb56832f6353218dbd72bc2dfa2
parentba8757b44ac824b70c6e5ea10248c1d637716b0d (diff)
Add the 'dirs' crate, enable the required 'winapi' features
-rw-r--r--BUILD.gn1
-rw-r--r--Cargo.toml2
-rw-r--r--build_extra/rust/BUILD.gn19
m---------third_party0
4 files changed, 21 insertions, 1 deletions
diff --git a/BUILD.gn b/BUILD.gn
index cd4ca964d..220406700 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -48,6 +48,7 @@ main_extern = [
"$rust_build:tokio",
"$rust_build:url",
"$rust_build:remove_dir_all",
+ "$rust_build:dirs",
"//build_extra/flatbuffers/rust:flatbuffers",
":msg_rs",
]
diff --git a/Cargo.toml b/Cargo.toml
index 5b17f6756..ae3c8f59d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,4 +17,4 @@ tokio = "0.1"
hyper = "0.12.8"
hyper-rustls = "0.14.0"
flatbuffers = { path = "third_party/flatbuffers/rust/flatbuffers/" }
-
+dirs = "1.0.3"
diff --git a/build_extra/rust/BUILD.gn b/build_extra/rust/BUILD.gn
index f75b96301..af8496913 100644
--- a/build_extra/rust/BUILD.gn
+++ b/build_extra/rust/BUILD.gn
@@ -103,6 +103,7 @@ rust_crate("winapi") {
"basetsd",
"cfg",
"cfgmgr32",
+ "combaseapi",
"errhandlingapi",
"excpt",
"fileapi",
@@ -110,6 +111,7 @@ rust_crate("winapi") {
"handleapi",
"inaddr",
"in6addr",
+ "knownfolders",
"ktmtypes",
"libloaderapi",
"lsalookup",
@@ -119,15 +121,24 @@ rust_crate("winapi") {
"ntdef",
"ntsecapi",
"ntstatus",
+ "objbase",
+ "objidl",
+ "objidlbase",
"processthreadsapi",
"profileapi",
+ "propidl",
"qos",
+ "rpc",
+ "rpcdce",
"rpcndr",
+ "shlobj",
+ "shtypes",
"sspi",
"std",
"subauth",
"sysinfoapi",
"timezoneapi",
+ "unknwnbase",
"vadefs",
"vcruntime",
"winbase",
@@ -598,6 +609,14 @@ rust_crate("hyper_rustls") {
]
}
+rust_crate("dirs") {
+ source_root = "$registry_github/dirs-1.0.3/src/lib.rs"
+ extern = [
+ ":libc",
+ ":winapi",
+ ]
+}
+
ring_root = "$registry_github/ring-0.13.2/"
component("ring_primitives") {
diff --git a/third_party b/third_party
-Subproject ff175a4d08d5d5154ca6313bac53540dda063fe
+Subproject 3e948f58ee654fdb2aa3898664962a52d648dc1