From f595c0abf35246db59971474f2db06e53ff75c60 Mon Sep 17 00:00:00 2001
From: oh_ci <maguangsheng1@huawei.com>
Date: Tue, 31 Dec 2024 07:30:23 +0000
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!19=20:?=
 =?UTF-8?q?=20third=5Fparty=5Frust=5Fcxx=E9=83=A8=E4=BB=B6=E5=8C=96?=
 =?UTF-8?q?=E6=94=B9=E9=80=A0'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BUILD.gn         |  6 +-----
 bundle.json      | 44 --------------------------------------------
 gen/cmd/BUILD.gn |  2 --
 macro/BUILD.gn   |  6 +-----
 4 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 bundle.json

diff --git a/BUILD.gn b/BUILD.gn
index ae8ceabe..3011439f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -24,15 +24,13 @@ ohos_cargo_crate("lib") {
   cargo_pkg_authors = "David Tolnay <dtolnay@gmail.com>"
   cargo_pkg_name = "cxx"
   cargo_pkg_description = "Safe interop between Rust and C++"
-  deps = [ "//third_party/rust/crates/cxx/macro:macro_lib(${host_toolchain})" ]
+  deps = [ "//third_party/rust/crates/cxx/macro:lib(${host_toolchain})" ]
   features = [
     "alloc",
     "std",
   ]
   build_root = "build.rs"
   build_sources = [ "build.rs" ]
-  part_name = "rust_cxx"
-  subsystem_name = "thirdparty"
 }
 
 config("cxx_cppdeps_header_config") {
@@ -54,6 +52,4 @@ ohos_static_library("cxx_cppdeps") {
   } else {
     defines += [ "CXX_RS_EXPORT=__attribute__((visibility(\"default\")))" ]
   }
-  part_name = "rust_cxx"
-  subsystem_name = "thirdparty"
 }
diff --git a/bundle.json b/bundle.json
deleted file mode 100644
index 5f060a33..00000000
--- a/bundle.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "name": "@ohos/rust_cxx",
-    "description": "safe FFI between Rust and C++",
-    "version": "5.0",
-    "license": "Apache License 2.0",
-    "publishAs": "code-segment",
-    "segment": {
-      "destPath": "third_party/rust/crates/cxx"
-    },
-    "dirs": {},
-    "scripts": {},
-    "component": {
-      "name": "rust_cxx",
-      "subsystem": "thirdparty",
-      "adapted_system_type": [
-        "standard"
-      ],
-      "deps": {
-        "components": [
-            "rust_proc_macro2",
-            "rust_quote",
-            "rust_syn"
-        ]
-      },
-      "build": {
-            "sub_component": [],
-            "inner_kits": [
-                {
-                    "name": "//third_party/rust/crates/cxx:cxx_cppdeps"
-                },
-                {
-                    "name": "//third_party/rust/crates/cxx:lib"
-                },
-                {
-                    "name": "//third_party/rust/crates/cxx/macro:macro_lib"
-                },
-                {
-                  "name": "//third_party/rust/crates/cxx/gen/cmd:cxxbridge"
-                }
-            ],
-            "test": []
-        }
-    }
-  }
\ No newline at end of file
diff --git a/gen/cmd/BUILD.gn b/gen/cmd/BUILD.gn
index de28c016..8962c6df 100644
--- a/gen/cmd/BUILD.gn
+++ b/gen/cmd/BUILD.gn
@@ -31,6 +31,4 @@ ohos_cargo_crate("cxxbridge") {
     "//third_party/rust/crates/quote:lib",
     "//third_party/rust/crates/syn:lib",
   ]
-  part_name = "rust_cxx"
-  subsystem_name = "thirdparty"
 }
diff --git a/macro/BUILD.gn b/macro/BUILD.gn
index 4387dc93..d98f35a6 100644
--- a/macro/BUILD.gn
+++ b/macro/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//build/ohos.gni")
 
-ohos_cargo_crate("macro_lib") {
+ohos_cargo_crate("lib") {
   crate_name = "cxxbridge_macro"
   crate_type = "proc-macro"
   visibility = [ "//third_party/rust/crates/*" ]
@@ -30,8 +30,4 @@ ohos_cargo_crate("macro_lib") {
     "//third_party/rust/crates/quote:lib",
     "//third_party/rust/crates/syn:lib",
   ]
-  build_root = "build.rs"
-  build_sources = [ "build.rs" ]
-  part_name = "rust_cxx"
-  subsystem_name = "thirdparty"
 }
-- 
Gitee