Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I27427dde12f6f6c533e7533d1e08e23db464b80b
Change-Id: I7206a95940387bda7e7fe31c36adae897574e45f
diff --git a/Android.bp b/Android.bp
index 6c3c500..b27b7b0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,6 @@
// This file is generated by cargo_embargo.
-// Do not modify this file as changes will be overridden on upgrade.
+// Do not modify this file as most changes will be overridden on upgrade.
+// Content before the first "rust_*" or "genrule" module is preserved.
package {
default_applicable_licenses: ["external_rust_crates_fastrand_license"],
@@ -46,9 +47,10 @@
srcs: ["src/lib.rs"],
edition: "2018",
apex_available: [
+ "//apex_available:anyapex",
"//apex_available:platform",
- "com.android.virt",
],
product_available: true,
vendor_available: true,
+ min_sdk_version: "29",
}
diff --git a/cargo_embargo.json b/cargo_embargo.json
index fbb9fcd..3e8023e 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -1,7 +1,8 @@
{
"apex_available": [
- "//apex_available:platform",
- "com.android.virt"
+ "//apex_available:anyapex",
+ "//apex_available:platform"
],
+ "min_sdk_version": "29",
"run_cargo": false
}
