commit 4b05c7d91bd6841fdb104daf1c4fa62b94ea7f51
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Feb 15 19:37:00 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Feb 15 19:37:00 2024 +0000
tree 0839d88724ae2b2dfceea8c4d240f12e9e8d596f
parent 710f8cd0001caa58d7565414da3f6a72df0bd9cb
parent 6cee78e724264485bde41cb802e9cd6b38ec20ab

Snap for 11451325 from 6cee78e724264485bde41cb802e9cd6b38ec20ab to aml-frc-release

Change-Id: Ibfff4c04ef944d3b012144993f9565e049c10d36

Android.bp

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 @@
             // liblog is not added as a dependency for linux_musl target
             enabled: false,
         },
-    }
-    ,
+    },
+
 }

cargo2android.json

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
-}

cargo_embargo.json

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
+}