Merge "Revert^2 "Use cargo_embargo to update Android.bp and rules.mk"" into main
diff --git a/Android.bp b/Android.bp
index 29385f9..319eb9a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,6 +3,7 @@
package {
default_applicable_licenses: ["external_rust_crates_bitflags_license"],
+ default_team: "trendy_team_android_rust",
}
license {
@@ -28,3 +29,9 @@
vendor_available: true,
min_sdk_version: "29",
}
+
+dirgroup {
+ name: "trusty_dirgroup_external_rust_crates_bitflags",
+ visibility: ["//trusty/vendor/google/aosp/scripts"],
+ dirs: ["."],
+}
diff --git a/cargo_embargo.json b/cargo_embargo.json
index 9ce3b17..31f1605 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -4,8 +4,10 @@
"bitflags": {
"dep_blocklist": [
"libtrybuild"
- ]
+ ],
+ "rulesmk_patch": "patches/rules.mk.diff"
}
},
- "run_cargo": false
+ "run_cargo": false,
+ "generate_rulesmk": true
}
diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff
index 47616d9..a48a449 100644
--- a/patches/rules.mk.diff
+++ b/patches/rules.mk.diff
@@ -1,14 +1,14 @@
-diff --git b/rules.mk a/rules.mk
-index ccb9711..8005071 100644
---- b/rules.mk
-+++ a/rules.mk
-@@ -8,4 +8,9 @@ MODULE_SRCS := \
- $(LOCAL_DIR)/src/lib.rs \
-
+diff --git a/rules.mk b/rules.mk
+index 71d5809..71731d8 100644
+--- a/rules.mk
++++ b/rules.mk
+@@ -10,6 +10,8 @@ MODULE_RUST_CRATE_TYPES := rlib
+ MODULE_SRCS := $(LOCAL_DIR)/src/lib.rs
MODULE_RUST_EDITION := 2021
-+MODULE_LIBRARY_DEPS := \
+ MODULE_LIBRARY_DEPS := \
+-
+ trusty/user/base/lib/libcompiler_builtins-rust \
+ trusty/user/base/lib/libcore-rust \
-+ external/rust/crates/serde \
-+
++ $(call FIND_CRATE,serde) \
+
include make/library.mk
diff --git a/rules.mk b/rules.mk
index 8005071..71731d8 100644
--- a/rules.mk
+++ b/rules.mk
@@ -1,16 +1,17 @@
-# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json.
-# Do not modify this file as changes will be overridden on upgrade.
+# This file is generated by cargo_embargo.
+# Do not modify this file after the LOCAL_DIR line
+# because the changes will be overridden on upgrade.
+# Content before the first line starting with LOCAL_DIR is preserved.
LOCAL_DIR := $(GET_LOCAL_DIR)
MODULE := $(LOCAL_DIR)
MODULE_CRATE_NAME := bitflags
-MODULE_SRCS := \
- $(LOCAL_DIR)/src/lib.rs \
-
+MODULE_RUST_CRATE_TYPES := rlib
+MODULE_SRCS := $(LOCAL_DIR)/src/lib.rs
MODULE_RUST_EDITION := 2021
MODULE_LIBRARY_DEPS := \
trusty/user/base/lib/libcompiler_builtins-rust \
trusty/user/base/lib/libcore-rust \
- external/rust/crates/serde \
+ $(call FIND_CRATE,serde) \
include make/library.mk
