commit af00fb6687c25b055cf3edac8288aea258a9f0f4
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Nov 11 02:11:49 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Nov 11 02:11:49 2023 +0000
tree 012c6708f5fc1f6e6b174eb6a0d020847568fd97
parent d300498d19c14dd41bdfb8b649f55897ba7d1bd9
parent 09612286ef088bf2eef5670071848a894ad198c8

Snap for 11084970 from 09612286ef088bf2eef5670071848a894ad198c8 to 24Q1-release

Change-Id: Ia2ab8bcdfbb68c7ab91eaebc128b0509939939d1

Android.bp

diff --git a/Android.bp b/Android.bp
index e394f70..8d6e11f 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 {

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index b98d10b..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.btservices",
-    "com.android.resolv",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "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..12fc32c
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,10 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.btservices",
+    "com.android.resolv",
+    "com.android.virt"
+  ],
+  "min_sdk_version": "29",
+  "tests": true
+}