commit 6bdb9aa5e8afca684f73b8b30a162f3064e183a6
author Andrew Walbran <qwandor@google.com> Tue Dec 19 21:51:33 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 19 21:51:33 2023 +0000
tree e712291452e7209162321929a8ba910c3cfdcf68
parent 24ae9bdf266a4f591debfed1a5caaf1a4d0ce1e5
parent 416fa00db41a26838d430b87045edd48967a0be1

Migrate to cargo_embargo. am: eef4796c18 am: efb2acf134 am: 416fa00db4

Original change: https://android-review.googlesource.com/c/platform/external/rust/cxx/+/2882808

Change-Id: I2d903b8b829fe99b6894b2eb53533b166c720edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..ce4c2df
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+  "module_blocklist": ["demo", "libcxx", "libcxx_build", "libcxx_test_suite", "libcxxbridge_flags"],
+  "package": {
+    "cxxbridge-cmd": { "device_supported": false, "host_first_multilib": true },
+    "cxx-gen": {"device_supported": false, "host_first_multilib": true}
+  },
+  "run_cargo": false
+}

gen/cmd/Android.bp

diff --git a/gen/cmd/Android.bp b/gen/cmd/Android.bp
index 1c40220..688e996 100644
--- a/gen/cmd/Android.bp
+++ b/gen/cmd/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies --add_workspace --host-first-multilib --no-pkg-vers.
+// This file is generated by cargo_embargo.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -15,6 +15,7 @@
     name: "cxxbridge",
     crate_name: "cxxbridge",
     cargo_env_compat: true,
+    cargo_pkg_version: "1.0.93",
     srcs: ["src/main.rs"],
     edition: "2018",
     rustlibs: [

gen/lib/Android.bp

diff --git a/gen/lib/Android.bp b/gen/lib/Android.bp
index 64d2e16..6c8728b 100644
--- a/gen/lib/Android.bp
+++ b/gen/lib/Android.bp
@@ -1,3 +1,6 @@
+// This file is generated by cargo_embargo.
+// Do not modify this file as changes will be overridden on upgrade.
+
 rust_library_host {
     name: "libcxx_gen",
     crate_name: "cxx_gen",
@@ -12,6 +15,4 @@
         "libsyn",
     ],
     compile_multilib: "first",
-    product_available: true,
-    vendor_available: true,
 }

macro/Android.bp

diff --git a/macro/Android.bp b/macro/Android.bp
index 6f6b12a..f833c43 100644
--- a/macro/Android.bp
+++ b/macro/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies --add_workspace.
+// This file is generated by cargo_embargo.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -15,7 +15,7 @@
     name: "libcxxbridge_macro",
     crate_name: "cxxbridge_macro",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.0.85",
+    cargo_pkg_version: "1.0.93",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
@@ -23,4 +23,6 @@
         "libquote",
         "libsyn",
     ],
+    product_available: true,
+    vendor_available: true,
 }