Snap for 11117647 from 19f93951a58c6a26b3bee63a359fe2bc9c08d61b to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I5af15b9ee27c32abc37622db9a18cb53a31169a9

2 files changed, 5 insertions, 12 deletions

diff --git a/Android.bp b/Android.bp
index 4900f04..4aaab98 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 {
@@ -20,7 +20,6 @@ license {
 
 rust_library {
     name: "libuntrusted",
-    // has rustc warnings
     host_supported: true,
     crate_name: "untrusted",
     cargo_env_compat: true,
@@ -40,7 +39,6 @@ rust_library {
 
 rust_test {
     name: "untrusted_test_tests_tests",
-    // has rustc warnings
     host_supported: true,
     crate_name: "tests",
     cargo_env_compat: true,
@@ -52,7 +50,5 @@ rust_test {
         unit_test: true,
     },
     edition: "2018",
-    rustlibs: [
-        "libuntrusted",
-    ],
+    rustlibs: ["libuntrusted"],
 }
diff --git a/cargo2android.json b/cargo_embargo.json
index 506d866..2718013 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,13 +1,10 @@
 {
-  "apex-available": [
+  "apex_available": [
     "//apex_available:platform",
     "com.android.compos",
     "com.android.resolv",
     "com.android.virt"
   ],
-  "dependencies": true,
-  "device": true,
-  "min-sdk-version": "29",
-  "run": true,
+  "min_sdk_version": "29",
   "tests": true
-}
\ No newline at end of file
+}