aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Hsieh <victorhsieh@google.com>2021-05-14 22:56:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-05-14 22:56:42 +0000
commitb39c94ee3e9df532d310c2c3fccfdd80480bd824 (patch)
treeeb94386064fc3ad105a21cad96eeb465449316c2
parenta9be719cb968eb321ebe41e1f6d2289d6a54d231 (diff)
parent4bfdef68d0584f8d25d8ea20716a7b5c47668350 (diff)
downloadanyhow-b39c94ee3e9df532d310c2c3fccfdd80480bd824.tar.gz
Make available to com.android.compos apex am: 4bfdef68d0
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/anyhow/+/1705427 Change-Id: Ibadf73acdc6d88ac85c2bfcca51937af8b80d7a5
-rw-r--r--Android.bp24
-rw-r--r--TEST_MAPPING29
-rw-r--r--cargo2android.json1
3 files changed, 33 insertions, 21 deletions
diff --git a/Android.bp b/Android.bp
index a1b2e3e..d5e66fe 100644
--- a/Android.bp
+++ b/Android.bp
@@ -264,6 +264,7 @@ rust_library {
cfgs: ["backtrace"],
apex_available: [
"//apex_available:platform",
+ "com.android.compos",
"com.android.resolv",
"com.android.virt",
],
@@ -271,14 +272,15 @@ rust_library {
}
// dependent_library ["feature_list"]
+// autocfg-1.0.1
// dissimilar-1.0.2
-// futures-0.3.14
-// futures-channel-0.3.14 "futures-sink,sink"
-// futures-core-0.3.14
-// futures-io-0.3.14
-// futures-sink-0.3.14
-// futures-task-0.3.14
-// futures-util-0.3.14 "futures-sink,sink"
+// futures-0.3.15
+// futures-channel-0.3.15 "futures-sink,sink"
+// futures-core-0.3.15
+// futures-io-0.3.15
+// futures-sink-0.3.15
+// futures-task-0.3.15
+// futures-util-0.3.15 "futures-sink,sink"
// glob-0.3.0
// itoa-0.4.7
// lazy_static-1.4.0
@@ -288,13 +290,13 @@ rust_library {
// quote-1.0.9 "default,proc-macro"
// rustversion-1.0.4
// ryu-1.0.5
-// serde-1.0.125 "default,derive,serde_derive,std"
-// serde_derive-1.0.125 "default"
+// serde-1.0.126 "default,derive,serde_derive,std"
+// serde_derive-1.0.126 "default"
// serde_json-1.0.64 "default,std"
-// syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote"
+// syn-1.0.72 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote"
// termcolor-1.1.2
// thiserror-1.0.24
// thiserror-impl-1.0.24
// toml-0.5.8 "default"
// trybuild-1.0.42 "diff,dissimilar"
-// unicode-xid-0.2.1 "default"
+// unicode-xid-0.2.2 "default"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 2ef5af6..7e8e55c 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,22 +2,22 @@
{
"presubmit": [
{
- "name": "anyhow_device_test_tests_test_autotrait"
+ "name": "ZipFuseTest"
},
{
- "name": "anyhow_device_test_tests_test_context"
+ "name": "anyhow_device_test_src_lib"
},
{
- "name": "anyhow_device_test_tests_test_repr"
+ "name": "anyhow_device_test_tests_test_autotrait"
},
{
- "name": "keystore2_test"
+ "name": "anyhow_device_test_tests_test_boxed"
},
{
"name": "anyhow_device_test_tests_test_chain"
},
{
- "name": "anyhow_device_test_tests_test_fmt"
+ "name": "anyhow_device_test_tests_test_context"
},
{
"name": "anyhow_device_test_tests_test_convert"
@@ -26,22 +26,31 @@
"name": "anyhow_device_test_tests_test_downcast"
},
{
- "name": "anyhow_device_test_tests_test_macros"
+ "name": "anyhow_device_test_tests_test_ffi"
},
{
- "name": "anyhow_device_test_tests_test_boxed"
+ "name": "anyhow_device_test_tests_test_fmt"
},
{
- "name": "keystore2_selinux_test"
+ "name": "anyhow_device_test_tests_test_macros"
+ },
+ {
+ "name": "anyhow_device_test_tests_test_repr"
},
{
"name": "anyhow_device_test_tests_test_source"
},
{
- "name": "anyhow_device_test_src_lib"
+ "name": "authfs_device_test_src_lib"
},
{
- "name": "anyhow_device_test_tests_test_ffi"
+ "name": "doh_unit_test"
+ },
+ {
+ "name": "keystore2_selinux_test"
+ },
+ {
+ "name": "keystore2_test"
},
{
"name": "vpnprofilestore_test"
diff --git a/cargo2android.json b/cargo2android.json
index e1dc8e8..655ebd1 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,6 +1,7 @@
{
"apex-available": [
"//apex_available:platform",
+ "com.android.compos",
"com.android.resolv",
"com.android.virt"
],