Snap for 10998418 from 6cee78e724264485bde41cb802e9cd6b38ec20ab to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I085bf8bb5e016b30c310d04e578c820b4aa0b871

3 files changed, 12 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index 72b6b37..f8d4683 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 {
@@ -63,6 +63,6 @@ rust_library {
             // liblog is not added as a dependency for linux_musl target
             enabled: false,
         },
-    }
-    ,
+    },
+
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 17c8006..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "add-module-block": "cargo2android_glibc.bp",
-  "apex-available": [
-    "//apex_available:platform",
-    "//apex_available:anyapex"
-  ],
-  "dependencies": true,
-  "device": true,
-  "min-sdk-version": "29",
-  "run": true,
-  "vendor-available": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..b0b55c1
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+  "min_sdk_version": "29",
+  "package": {
+    "android_log-sys": {
+      "add_module_block": "cargo2android_glibc.bp"
+    }
+  },
+  "run_cargo": false
+}