Snap for 12743396 from 6e2762dbe69ae25ed5b9462f96261e3db15d2e68 to sdk-release
Change-Id: I95d622ead1671c387a61f3d786eba9961fdcadc2
diff --git a/Android.bp b/Android.bp
index 2290539..96beb97 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,47 +1 @@
-// This file is generated by cargo_embargo.
-// Do not modify this file because the changes will be overridden on upgrade.
-
-package {
- default_applicable_licenses: ["external_rust_crates_uefi_license"],
- default_team: "trendy_team_android_rust",
-}
-
-license {
- name: "external_rust_crates_uefi_license",
- visibility: [":__subpackages__"],
- license_kinds: ["SPDX-license-identifier-MPL-2.0"],
- license_text: ["LICENSE"],
-}
-
-rust_library_rlib {
- name: "libuefi_nostd",
- crate_name: "uefi",
- cargo_env_compat: true,
- cargo_pkg_version: "0.33.0",
- crate_root: "src/lib.rs",
- edition: "2021",
- features: ["alloc"],
- rustlibs: [
- "libbitflags",
- "libcfg_if",
- "liblog_rust",
- "libptr_meta_nostd",
- "libucs2_nostd",
- "libuefi_raw_nostd",
- "libuguid_nostd",
- ],
- proc_macros: ["libuefi_macros"],
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- prefer_rlib: true,
- no_stdlibs: true,
- stdlibs: [
- "liballoc.rust_sysroot",
- "libcompiler_builtins.rust_sysroot",
- "libcore.rust_sysroot",
- ],
- product_available: true,
- vendor_available: true,
-}
+// This crate has been migrated to external/rust/android-crates-io.
diff --git a/Cargo.toml b/Cargo.toml
index a83f6f6..6730041 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -84,7 +84,7 @@
[features]
alloc = []
-default = ["alloc", "log-debugcon"]
+default = ["log-debugcon"]
global_allocator = []
log-debugcon = []
logger = []
diff --git a/cargo_embargo.json b/cargo_embargo.json
deleted file mode 100644
index 85a045b..0000000
--- a/cargo_embargo.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "run_cargo": false,
- "features": [
- "alloc"
- ],
- "module_name_overrides": {
- "libptr_meta": "libptr_meta_nostd",
- "libucs2": "libucs2_nostd",
- "libuefi": "libuefi_nostd",
- "libuefi_raw": "libuefi_raw_nostd",
- "libuguid": "libuguid_nostd"
- },
- "package": {
- "uefi": {
- "alloc": true,
- "force_rlib": true,
- "host_supported": false,
- "no_std": true
- }
- }
-}
