Fix some things
Remove a test that doesn't exist.
Fix the patch file so it applies correctly.
We also update to the new Android.bp cfg syntax while we're at it.
Fixes: 185447793
Test: Build
Test: Run cargo2android.
Change-Id: Idde01ab27378bb0bd3b806972f0232ce9ae778fd
diff --git a/Android.bp b/Android.bp
index 28faf4e..48205a6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,15 +49,15 @@
"extra_traits",
"std",
],
- flags: [
- "--cfg freebsd11",
- "--cfg libc_align",
- "--cfg libc_cfg_target_vendor",
- "--cfg libc_const_size_of",
- "--cfg libc_core_cvoid",
- "--cfg libc_packedN",
- "--cfg libc_priv_mod_use",
- "--cfg libc_union",
+ cfgs: [
+ "freebsd11",
+ "libc_align",
+ "libc_cfg_target_vendor",
+ "libc_const_size_of",
+ "libc_core_cvoid",
+ "libc_packedN",
+ "libc_priv_mod_use",
+ "libc_union",
],
}
@@ -86,15 +86,15 @@
"extra_traits",
"std",
],
- flags: [
- "--cfg freebsd11",
- "--cfg libc_align",
- "--cfg libc_cfg_target_vendor",
- "--cfg libc_const_size_of",
- "--cfg libc_core_cvoid",
- "--cfg libc_packedN",
- "--cfg libc_priv_mod_use",
- "--cfg libc_union",
+ cfgs: [
+ "freebsd11",
+ "libc_align",
+ "libc_cfg_target_vendor",
+ "libc_const_size_of",
+ "libc_core_cvoid",
+ "libc_packedN",
+ "libc_priv_mod_use",
+ "libc_union",
],
rustlibs: [
"liblibc",
@@ -125,15 +125,15 @@
"extra_traits",
"std",
],
- flags: [
- "--cfg freebsd11",
- "--cfg libc_align",
- "--cfg libc_cfg_target_vendor",
- "--cfg libc_const_size_of",
- "--cfg libc_core_cvoid",
- "--cfg libc_packedN",
- "--cfg libc_priv_mod_use",
- "--cfg libc_union",
+ cfgs: [
+ "freebsd11",
+ "libc_align",
+ "libc_cfg_target_vendor",
+ "libc_const_size_of",
+ "libc_core_cvoid",
+ "libc_packedN",
+ "libc_priv_mod_use",
+ "libc_union",
],
apex_available: [
"//apex_available:platform",