From b496923cbb0de7312de837d69d0a5faf342982e2 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sun, 24 Jul 2022 06:14:49 -0700
Subject: [PATCH] Update Cargo.toml

---
 native/src/Cargo.lock      | 10 +++++-----
 native/src/Cargo.toml      | 12 +++---------
 native/src/base/Cargo.toml |  2 +-
 native/src/core/Cargo.toml |  2 +-
 native/src/core/lib.rs     |  2 +-
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/native/src/Cargo.lock b/native/src/Cargo.lock
index 6ed008895..ae84faeb8 100644
--- a/native/src/Cargo.lock
+++ b/native/src/Cargo.lock
@@ -17,7 +17,7 @@ checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
 
 [[package]]
 name = "cxx"
-version = "1.0.69"
+version = "1.0.72"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -26,11 +26,11 @@ dependencies = [
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.69"
+version = "1.0.72"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.69"
+version = "1.0.72"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -98,6 +98,6 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
+checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7"
diff --git a/native/src/Cargo.toml b/native/src/Cargo.toml
index 78c62a3bf..82a2c6f1b 100644
--- a/native/src/Cargo.toml
+++ b/native/src/Cargo.toml
@@ -1,12 +1,6 @@
 [workspace]
-
-members = [
-    "base",
-    "boot",
-    "core",
-    "init",
-    "sepolicy",
-]
+exclude = ["external"]
+members = ["base", "boot", "core", "init", "sepolicy"]
 
 [profile.dev]
 opt-level = "z"
@@ -23,4 +17,4 @@ panic = "abort"
 strip = true
 
 [patch.crates-io]
-cxx = { path = "../src/external/cxx-rs" }
+cxx = { path = "external/cxx-rs" }
diff --git a/native/src/base/Cargo.toml b/native/src/base/Cargo.toml
index 7a0d451ea..ff3ba5880 100644
--- a/native/src/base/Cargo.toml
+++ b/native/src/base/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2021"
 path = "lib.rs"
 
 [dependencies]
-cxx = "1.0.69"
+cxx = { path = "../external/cxx-rs" }
diff --git a/native/src/core/Cargo.toml b/native/src/core/Cargo.toml
index 9a9a19597..941fdd7c4 100644
--- a/native/src/core/Cargo.toml
+++ b/native/src/core/Cargo.toml
@@ -9,4 +9,4 @@ path = "lib.rs"
 
 [dependencies]
 base = { path = "../base" }
-cxx = "1.0.69"
+cxx = { path = "../external/cxx-rs" }
diff --git a/native/src/core/lib.rs b/native/src/core/lib.rs
index 0d8ab66c8..7b6b01cff 100644
--- a/native/src/core/lib.rs
+++ b/native/src/core/lib.rs
@@ -1,5 +1,5 @@
 pub use base;
-pub use logging::*;
+use logging::*;
 
 mod logging;