Fix build files.
* Update rules.mk.diff so it applies.
* Regenerate Android.bp
Bug: http://b/339424309
Test: treehugger
Change-Id: I73f5274d796a2d70dd85c0f838cc09e188ec720c
diff --git a/Android.bp b/Android.bp
index 00cb966..2e75afd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,25 +1,16 @@
// This file is generated by cargo_embargo.
-// Do not modify this file after the first "rust_*" or "genrule" module
-// because the changes will be overridden on upgrade.
-// Content before the first "rust_*" or "genrule" module is preserved.
+// Do not modify this file because the changes will be overridden on upgrade.
package {
- default_applicable_licenses: [
- "external_rust_crates_virtio-drivers_license",
- ],
+ default_applicable_licenses: ["external_rust_crates_virtio-drivers_license"],
+ default_team: "trendy_team_android_rust",
}
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
license {
name: "external_rust_crates_virtio-drivers_license",
visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-MIT",
- ],
- license_text: [
- "LICENSE",
- ],
+ license_kinds: ["SPDX-license-identifier-MIT"],
+ license_text: ["LICENSE"],
}
rust_library_rlib {
diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff
index 17d1333..24c9437 100644
--- a/patches/rules.mk.diff
+++ b/patches/rules.mk.diff
@@ -1,12 +1,12 @@
-diff --git a/rules.mk b/rules.mk
-index fe61b75..f43c05b 100644
---- a/rules.mk
-+++ b/rules.mk
-@@ -13,6 +13,7 @@ MODULE_RUSTFLAGS += \
- --cfg 'feature="default"' \
+diff --git b/rules.mk a/rules.mk
+index 078c0bb..3ccd69f 100644
+--- b/rules.mk
++++ a/rules.mk
+@@ -14,6 +14,7 @@ MODULE_RUSTFLAGS += \
+ --cfg 'feature="alloc"'
MODULE_LIBRARY_DEPS := \
+ trusty/user/base/lib/liballoc-rust \
- external/rust/crates/bitflags \
- external/rust/crates/log \
- external/rust/crates/zerocopy \
+ $(call FIND_CRATE,bitflags) \
+ $(call FIND_CRATE,log) \
+ $(call FIND_CRATE,zerocopy) \
