Snap for 12503729 from 227e36dc005eabe0a450cd454e7db743db248096 to sdk-release
Change-Id: I9e69ccf82e4bc66ce7efb063c584fe463ec37657
diff --git a/Android.bp b/Android.bp
index 592e2b0..96beb97 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,67 +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_unicode-xid_license"],
-}
-
-license {
- name: "external_rust_crates_unicode-xid_license",
- visibility: [":__subpackages__"],
- license_kinds: ["SPDX-license-identifier-Apache-2.0"],
- license_text: ["LICENSE"],
-}
-
-rust_library {
- name: "libunicode_xid",
- host_supported: true,
- crate_name: "unicode_xid",
- cargo_env_compat: true,
- cargo_pkg_version: "0.2.4",
- crate_root: "src/lib.rs",
- edition: "2015",
- features: ["default"],
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- product_available: true,
- vendor_available: true,
-}
-
-rust_test {
- name: "unicode-xid_test_src_lib",
- host_supported: true,
- crate_name: "unicode_xid",
- cargo_env_compat: true,
- cargo_pkg_version: "0.2.4",
- crate_root: "src/lib.rs",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- test_options: {
- unit_test: true,
- },
- edition: "2015",
- features: ["default"],
- rustlibs: ["libcriterion"],
-}
-
-rust_test {
- name: "unicode-xid_test_tests_exhaustive_tests",
- host_supported: true,
- crate_name: "exhaustive_tests",
- cargo_env_compat: true,
- cargo_pkg_version: "0.2.4",
- crate_root: "tests/exhaustive_tests.rs",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- test_options: {
- unit_test: true,
- },
- edition: "2015",
- features: ["default"],
- rustlibs: [
- "libcriterion",
- "libunicode_xid",
- ],
-}
+// This crate has been migrated to external/rust/android-crates-io.
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index 3a1c7de..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,33 +0,0 @@
-// Generated by update_crate_tests.py for tests that depend on this crate.
-{
- "imports": [
- {
- "path": "external/rust/crates/zeroize"
- },
- {
- "path": "external/uwb/src"
- },
- {
- "path": "system/keymint/derive"
- },
- {
- "path": "system/keymint/hal"
- }
- ],
- "presubmit": [
- {
- "name": "unicode-xid_test_src_lib"
- },
- {
- "name": "unicode-xid_test_tests_exhaustive_tests"
- }
- ],
- "presubmit-rust": [
- {
- "name": "unicode-xid_test_src_lib"
- },
- {
- "name": "unicode-xid_test_tests_exhaustive_tests"
- }
- ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
deleted file mode 100644
index c8842d1..0000000
--- a/cargo_embargo.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "run_cargo": false,
- "tests": true
-}
diff --git a/patches/std.diff b/patches/std.diff
index 2c1f33b..ac496d9 100644
--- a/patches/std.diff
+++ b/patches/std.diff
@@ -1,25 +1,3 @@
-diff --git a/patches/std.diff b/patches/std.diff
-index 8237bc9..e69de29 100644
---- a/patches/std.diff
-+++ b/patches/std.diff
-@@ -1,17 +0,0 @@
--diff --git a/src/lib.rs b/src/lib.rs
--index 01c81e2..927fc9a 100644
----- a/src/lib.rs
--+++ b/src/lib.rs
--@@ -37,8 +37,9 @@
-- #![no_std]
-- #![cfg_attr(feature = "bench", feature(test, unicode_internals))]
--
---#[cfg(test)]
---#[macro_use]
--+// #[cfg(test)]
--+// ANDROID: Unconditionally use std to allow building as a dylib.
--+// #[macro_use]
--+#[cfg(android_dylib)]
-- extern crate std;
--
-- #[cfg(feature = "bench")]
diff --git a/src/lib.rs b/src/lib.rs
index af7015e..b4d5a1a 100644
--- a/src/lib.rs
