Migrate bitflags to monorepo, with upgrade to 2.6.0
Bug: http://b/339424309
Test: treehugger
Change-Id: I68a9e9167492f45a457d3b5deb5c3d6d32297c3e
diff --git a/Android.bp b/Android.bp
index 319eb9a..96beb97 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,37 +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_license"],
- default_team: "trendy_team_android_rust",
-}
-
-license {
- name: "external_rust_crates_bitflags_license",
- visibility: [":__subpackages__"],
- license_kinds: ["SPDX-license-identifier-Apache-2.0"],
- license_text: ["LICENSE"],
-}
-
-rust_library {
- name: "libbitflags",
- host_supported: true,
- crate_name: "bitflags",
- cargo_env_compat: true,
- cargo_pkg_version: "2.5.0",
- crate_root: "src/lib.rs",
- edition: "2021",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- product_available: true,
- vendor_available: true,
- min_sdk_version: "29",
-}
-
-dirgroup {
- name: "trusty_dirgroup_external_rust_crates_bitflags",
- visibility: ["//trusty/vendor/google/aosp/scripts"],
- dirs: ["."],
-}
+// This crate has been migrated to external/rust/android-crates-io.
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index 4624d6d..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,79 +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": [],
- "presubmit-rust": []
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
deleted file mode 100644
index 31f1605..0000000
--- a/cargo_embargo.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "min_sdk_version": "29",
- "package": {
- "bitflags": {
- "dep_blocklist": [
- "libtrybuild"
- ],
- "rulesmk_patch": "patches/rules.mk.diff"
- }
- },
- "run_cargo": false,
- "generate_rulesmk": true
-}
