Snap for 7325096 from 8ceb2c6d3b4581740ffa5fa857a2023b8f3985e5 to sc-d1-release
Change-Id: Ic5c1f8092c93e4e296563e3237b626e0f608b05a
diff --git a/Android.bp b/Android.bp
index 169fd1c..4339cae 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --dependencies --device --tests --patch=patches/Android.bp.patch.
+// This file is generated by cargo2android.py --config cargo2android.json.
+// Do not modify this file as changes will be overridden on upgrade.
package {
default_applicable_licenses: ["external_rust_crates_bitflags_license"],
@@ -45,14 +46,15 @@
auto_gen_config: true,
edition: "2015",
features: ["default"],
- flags: [
- "--cfg bitflags_const_fn",
- ],
+ cfgs: ["bitflags_const_fn"],
}
rust_test_host {
name: "bitflags_host_test_src_lib",
defaults: ["bitflags_defaults"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
@@ -68,9 +70,7 @@
srcs: ["src/lib.rs"],
edition: "2015",
features: ["default"],
- flags: [
- "--cfg bitflags_const_fn",
- ],
+ cfgs: ["bitflags_const_fn"],
apex_available: [
"//apex_available:platform",
"com.android.virt",
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..ac56e26
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,10 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "dependencies": true,
+ "device": true,
+ "run": true,
+ "tests": true
+}
\ No newline at end of file
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
deleted file mode 100644
index 580673c..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 30e65f1..3234f17 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -39,4 +39,8 @@ rust_library {
- flags: [
- "--cfg bitflags_const_fn",
- ],
-+ apex_available: [
-+ "//apex_available:platform",
-+ "com.android.virt",
-+ ],
- }
