Merge "Revert^2 "Use cargo_embargo to update Android.bp and rules.mk"" into main
diff --git a/1.3.2/Android.bp b/1.3.2/Android.bp
index e10c542..5a11914 100644
--- a/1.3.2/Android.bp
+++ b/1.3.2/Android.bp
@@ -1,83 +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_bitflags-1.3.2_license"],
- default_team: "trendy_team_android_rust",
-}
-
-license {
- name: "external_rust_crates_bitflags-1.3.2_license",
- visibility: [":__subpackages__"],
- license_kinds: ["SPDX-license-identifier-Apache-2.0"],
- license_text: ["LICENSE"],
-}
-
-rust_test {
- name: "bitflags_test_src_lib-1.3.2",
- host_supported: true,
- crate_name: "bitflags",
- cargo_env_compat: true,
- cargo_pkg_version: "1.3.2",
- crate_root: "src/lib.rs",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- test_options: {
- unit_test: true,
- },
- edition: "2018",
- features: ["default"],
- rustlibs: [
- "libserde",
- "libserde_json",
- "libwalkdir",
- ],
- proc_macros: [
- "librustversion",
- "libserde_derive",
- ],
-}
-
-rust_test {
- name: "bitflags_test_tests_basic-1.3.2",
- host_supported: true,
- crate_name: "basic",
- cargo_env_compat: true,
- cargo_pkg_version: "1.3.2",
- crate_root: "tests/basic.rs",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- test_options: {
- unit_test: true,
- },
- edition: "2018",
- features: ["default"],
- rustlibs: [
- "libbitflags-1.3.2",
- "libserde",
- "libserde_json",
- "libwalkdir",
- ],
- proc_macros: [
- "librustversion",
- "libserde_derive",
- ],
-}
-
-rust_library {
- name: "libbitflags-1.3.2",
- host_supported: true,
- crate_name: "bitflags",
- cargo_env_compat: true,
- cargo_pkg_version: "1.3.2",
- crate_root: "src/lib.rs",
- edition: "2018",
- features: ["default"],
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- product_available: true,
- vendor_available: true,
- min_sdk_version: "29",
-}
+// This crate has been migrated to external/rust/android-crates-io/extra_versions.
diff --git a/1.3.2/TEST_MAPPING b/1.3.2/TEST_MAPPING
deleted file mode 100644
index 342b698..0000000
--- a/1.3.2/TEST_MAPPING
+++ /dev/null
@@ -1,93 +0,0 @@
-// Generated by update_crate_tests.py for tests that depend on this crate.
-{
- "imports": [
- {
- "path": "external/rust/crates/base64"
- },
- {
- "path": "external/rust/crates/clap/2.33.3"
- },
- {
- "path": "external/rust/crates/gdbstub_arch"
- },
- {
- "path": "external/rust/crates/libsqlite3-sys"
- },
- {
- "path": "external/rust/crates/tinytemplate"
- },
- {
- "path": "external/rust/crates/tinyvec"
- },
- {
- "path": "external/rust/crates/tokio"
- },
- {
- "path": "external/rust/crates/unicode-xid"
- },
- {
- "path": "external/rust/crates/virtio-drivers"
- },
- {
- "path": "packages/modules/Virtualization/apkdmverity"
- },
- {
- "path": "packages/modules/Virtualization/authfs"
- },
- {
- "path": "packages/modules/Virtualization/avmd"
- },
- {
- "path": "packages/modules/Virtualization/encryptedstore"
- },
- {
- "path": "packages/modules/Virtualization/libs/apkverify"
- },
- {
- "path": "packages/modules/Virtualization/libs/capabilities"
- },
- {
- "path": "packages/modules/Virtualization/libs/devicemapper"
- },
- {
- "path": "packages/modules/Virtualization/microdroid_manager"
- },
- {
- "path": "packages/modules/Virtualization/virtualizationmanager"
- },
- {
- "path": "packages/modules/Virtualization/vm"
- },
- {
- "path": "packages/modules/Virtualization/zipfuse"
- },
- {
- "path": "system/security/diced"
- },
- {
- "path": "system/security/keystore2"
- },
- {
- "path": "system/security/keystore2/legacykeystore"
- },
- {
- "path": "system/security/keystore2/src/crypto"
- }
- ],
- "presubmit": [
- {
- "name": "bitflags_test_src_lib-1.3.2"
- },
- {
- "name": "bitflags_test_tests_basic-1.3.2"
- }
- ],
- "presubmit-rust": [
- {
- "name": "bitflags_test_src_lib-1.3.2"
- },
- {
- "name": "bitflags_test_tests_basic-1.3.2"
- }
- ]
-}
diff --git a/1.3.2/cargo_embargo.json b/1.3.2/cargo_embargo.json
deleted file mode 100644
index 9e90a94..0000000
--- a/1.3.2/cargo_embargo.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "min_sdk_version": "29",
- "module_blocklist": [
- "bitflags_test_tests_compile"
- ],
- "module_name_overrides": {
- "bitflags_test_src_lib": "bitflags_test_src_lib-1.3.2",
- "bitflags_test_tests_basic": "bitflags_test_tests_basic-1.3.2",
- "libbitflags": "libbitflags-1.3.2",
- "external_rust_crates_bitflags_license": "external_rust_crates_bitflags-1.3.2_license"
- },
- "package": {
- "bitflags": {
- "dep_blocklist": [
- "libtrybuild"
- ]
- }
- },
- "run_cargo": false,
- "tests": true
-}
