From a7cd22e13e569639757e163bbbe85655444c27f8 Mon Sep 17 00:00:00 2001
From: Mitchell Hentges <mhentges@mozilla.com>
Date: Thu, 29 Apr 2021 15:19:27 +0000
Subject: [PATCH] Bug 1705376: Synchronize workspace-hack features and usage
 r=firefox-build-system-reviewers,glandium

Not all in-tree Rust libraries were using workspace-hack.
Additionally, some needed winapi features were missing from
workspace-hack's configuration.

Now, winapi is re-compiled less frequently on a full build.

Differential Revision: https://phabricator.services.mozilla.com/D113564
---
 Cargo.lock                                    |  3 +++
 build/workspace-hack/Cargo.toml               | 26 +++++++++++++++++++
 security/manager/ssl/osclientcerts/Cargo.toml |  1 +
 toolkit/mozapps/defaultagent/rust/Cargo.toml  |  1 +
 4 files changed, 31 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 042635fa7fd3..4ad74b9fb9f3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1116,6 +1116,7 @@ name = "defaultagent-static"
 version = "0.1.0"
 dependencies = [
  "log",
+ "mozilla-central-workspace-hack",
  "serde",
  "serde_derive",
  "serde_json",
@@ -1788,6 +1789,7 @@ dependencies = [
  "log",
  "marionette",
  "mozdevice",
+ "mozilla-central-workspace-hack",
  "mozprofile",
  "mozrunner",
  "mozversion",
@@ -3687,6 +3689,7 @@ dependencies = [
  "lazy_static",
  "libloading 0.5.2",
  "log",
+ "mozilla-central-workspace-hack",
  "pkcs11",
  "rental",
  "sha2",
diff --git a/build/workspace-hack/Cargo.toml b/build/workspace-hack/Cargo.toml
index 1abffd88c6fd..bdc09a111c77 100644
--- a/build/workspace-hack/Cargo.toml
+++ b/build/workspace-hack/Cargo.toml
@@ -44,9 +44,25 @@ features = [
     "bitsmsg",
     "combaseapi",
     "consoleapi",
+    "d3d11",
+    "d3d11_1",
+    "d3d11sdklayers",
+    "d3d12",
+    "d3d12sdklayers",
+    "d3d12shader",
+    "d3dcommon",
+    "d3dcompiler",
     "dwrite",
     "dwrite_1",
     "dwrite_3",
+    "dxgi1_2",
+    "dxgi1_3",
+    "dxgi1_4",
+    "dxgi1_5",
+    "dxgi1_6",
+    "dxgidebug",
+    "dxgiformat",
+    "dxgitype",
     "errhandlingapi",
     "fileapi",
     "guiddef",
@@ -65,8 +81,11 @@ features = [
     "ntdef",
     "ntsecapi",
     "ntstatus",
+    "oaidl",
     "objbase",
+    "oleauto",
     "processenv",
+    "processthreadsapi",
     "profileapi",
     "psapi",
     "rpcndr",
@@ -75,14 +94,21 @@ features = [
     "std",
     "synchapi",
     "sysinfoapi",
+    "taskschd",
+    "timeapi",
     "timezoneapi",
     "unknwnbase",
     "winbase",
     "wincon",
+    "wincrypt",
+    "windef",
     "winerror",
+    "wininet",
     "winnls",
     "winnt",
+    "winreg",
     "winsock2",
+    "winuser",
     "ws2def",
     "ws2ipdef",
     "ws2tcpip",
diff --git a/security/manager/ssl/osclientcerts/Cargo.toml b/security/manager/ssl/osclientcerts/Cargo.toml
index bb3dd58c07b1..a29966516e04 100644
--- a/security/manager/ssl/osclientcerts/Cargo.toml
+++ b/security/manager/ssl/osclientcerts/Cargo.toml
@@ -12,6 +12,7 @@ byteorder = "1.3"
 env_logger = {version = "0.8", default-features = false } # disable `regex` to reduce code size
 lazy_static = "1"
 log = "0.4"
+mozilla-central-workspace-hack = { path = "../../../../build/workspace-hack" }
 pkcs11 = "0.4"
 sha2 = "0.8"
 
diff --git a/toolkit/mozapps/defaultagent/rust/Cargo.toml b/toolkit/mozapps/defaultagent/rust/Cargo.toml
index f3d91c8be352..fba3c0d35ccb 100644
--- a/toolkit/mozapps/defaultagent/rust/Cargo.toml
+++ b/toolkit/mozapps/defaultagent/rust/Cargo.toml
@@ -9,6 +9,7 @@ license = "MPL-2.0"
 
 [dependencies]
 log = { version = "0.4", features = ["std"] }
+mozilla-central-workspace-hack = { path = "../../../../build/workspace-hack" }
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"