From 10f0ace32e8b4940ba0776a5d867b693c1cda591 Mon Sep 17 00:00:00 2001
From: Austin Appleby <aappleby@google.com>
Date: Tue, 19 Apr 2022 18:51:56 -0700
Subject: [PATCH] Apparently we still need resolver = 2 for the build to work.
 :/

Change-Id: I45df25651d19b28ea5335aea8b394ae17394e60f
GitOrigin-RevId: 6eb5747eed94fd2f34686edd46169677f46b644a
---
 apps/system/components/DebugConsole/Cargo.toml        | 1 +
 apps/system/components/MemoryManager/Cargo.toml       | 1 +
 apps/system/components/MlCoordinator/Cargo.toml       | 1 +
 apps/system/components/ProcessManager/Cargo.toml      | 2 +-
 apps/system/components/SecurityCoordinator/Cargo.toml | 1 +
 apps/system/components/StorageManager/Cargo.toml      | 1 +
 apps/system/components/TimerService/Cargo.toml        | 1 +
 7 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/system/components/DebugConsole/Cargo.toml b/apps/system/components/DebugConsole/Cargo.toml
index 677121d..5459f4b 100644
--- a/apps/system/components/DebugConsole/Cargo.toml
+++ b/apps/system/components/DebugConsole/Cargo.toml
@@ -10,6 +10,7 @@ members = [
     "kata-uart-client",
     "zmodem",
 ]
+resolver = "2"
 
 [profile.dev]
 opt-level = 0
diff --git a/apps/system/components/MemoryManager/Cargo.toml b/apps/system/components/MemoryManager/Cargo.toml
index 92c86d2..bdab765 100644
--- a/apps/system/components/MemoryManager/Cargo.toml
+++ b/apps/system/components/MemoryManager/Cargo.toml
@@ -7,6 +7,7 @@ members = [
     "kata-memory-interface",
     "kata-memory-manager",
 ]
+resolver = "2"
 
 [profile.dev]
 opt-level = 0
diff --git a/apps/system/components/MlCoordinator/Cargo.toml b/apps/system/components/MlCoordinator/Cargo.toml
index 953f4ca..a6f0ac5 100644
--- a/apps/system/components/MlCoordinator/Cargo.toml
+++ b/apps/system/components/MlCoordinator/Cargo.toml
@@ -7,6 +7,7 @@ members = [
     "kata-ml-interface",
     "kata-vec-core"
 ]
+resolver = "2"
 
 [profile.dev]
 opt-level = 0
diff --git a/apps/system/components/ProcessManager/Cargo.toml b/apps/system/components/ProcessManager/Cargo.toml
index 04d23ca..e2af03f 100644
--- a/apps/system/components/ProcessManager/Cargo.toml
+++ b/apps/system/components/ProcessManager/Cargo.toml
@@ -7,7 +7,7 @@ members = [
     "kata-proc-interface",
     "kata-proc-manager",
 ]
-
+resolver = "2"
 
 [profile.dev]
 opt-level = 0
diff --git a/apps/system/components/SecurityCoordinator/Cargo.toml b/apps/system/components/SecurityCoordinator/Cargo.toml
index bf8bbf2..8188597 100644
--- a/apps/system/components/SecurityCoordinator/Cargo.toml
+++ b/apps/system/components/SecurityCoordinator/Cargo.toml
@@ -7,6 +7,7 @@ members = [
     "kata-security-coordinator",
     "kata-security-interface",
 ]
+resolver = "2"
 
 [profile.dev]
 opt-level = 0
diff --git a/apps/system/components/StorageManager/Cargo.toml b/apps/system/components/StorageManager/Cargo.toml
index af10114..a56bbb9 100644
--- a/apps/system/components/StorageManager/Cargo.toml
+++ b/apps/system/components/StorageManager/Cargo.toml
@@ -7,6 +7,7 @@ members = [
     "kata-storage-interface",
     "kata-storage-manager",
 ]
+resolver = "2"
 
 [profile.dev]
 opt-level = 0
diff --git a/apps/system/components/TimerService/Cargo.toml b/apps/system/components/TimerService/Cargo.toml
index 1fa3973..87ba9a6 100644
--- a/apps/system/components/TimerService/Cargo.toml
+++ b/apps/system/components/TimerService/Cargo.toml
@@ -8,6 +8,7 @@ members = [
     "kata-timer-service",
     "opentitan-timer"
 ]
+resolver = "2"
 
 [profile.dev]
 opt-level = 0