commit 3b515c49b88133b83fd0a89e0bf0c7873da8eeea
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Nov 21 00:12:48 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Nov 21 00:12:48 2023 +0000
tree 32a543cb7de12e587741bb8cb0b3c28791c6f838
parent 16e0ef9e5a19ca12691bf807530e29fcd125c38c
parent 9da1263a05352419807958ca2988cd06bad39c80

Snap for 11124398 from 9da1263a05352419807958ca2988cd06bad39c80 to 24Q1-release

Change-Id: Ia71854aa391fabe12f99a47be9ee8e80d26eec58

Android.bp

diff --git a/Android.bp b/Android.bp
index 31025f1..966a86f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -41,7 +41,6 @@
 
 rust_library {
     name: "libparking_lot_core",
-    // has rustc warnings
     host_supported: true,
     crate_name: "parking_lot_core",
     cargo_env_compat: true,
@@ -65,7 +64,6 @@
 
 rust_test {
     name: "parking_lot_core_test_src_lib",
-    // has rustc warnings
     host_supported: true,
     crate_name: "parking_lot_core",
     cargo_env_compat: true,

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index da746ae..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.btservices",
-    "com.android.virt"
-  ],
-  "device": true,
-  "min-sdk-version": "29",
-  "run": true,
-  "tests": true
-}

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..c9aea70
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,10 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.btservices",
+    "com.android.virt"
+  ],
+  "min_sdk_version": "29",
+  "run_cargo": false,
+  "tests": true
+}