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",
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 05e7a24..c268219 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -44,6 +44,12 @@
"name": "crossbeam-epoch_device_test_src_lib"
},
{
+ "name": "crossbeam-epoch_device_test_tests_loom"
+ },
+ {
+ "name": "doh_unit_test"
+ },
+ {
"name": "futures-util_device_test_src_lib"
},
{
@@ -83,9 +89,6 @@
"name": "libz-sys_device_test_src_lib"
},
{
- "name": "openssl-sys_device_test_src_lib"
- },
- {
"name": "parking_lot_core_device_test_src_lib"
},
{
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index 3acc4a1..59e2418 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -1,10 +1,8 @@
--- Android.bp 2020-12-14 23:34:21.725521979 +0900
+++ Android.bp.new 2020-12-14 23:30:18.808503638 +0900
- rust_defaults {
- name: "rust_libc_defaults",
-@@ -92,4 +92,10 @@ rust_library {
- "--cfg libc_priv_mod_use",
- "--cfg libc_union",
+@@ -135,4 +135,10 @@ rust_library {
+ "libc_priv_mod_use",
+ "libc_union",
],
+ apex_available: [
+ "//apex_available:platform",