aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-03-31 09:18:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-31 09:18:59 +0000
commitee63b7385ebc66b44db9261692b2d749e5910945 (patch)
tree39c5fbe61db41573685e86654ab3055523606f7b
parent42c0263de995274c936caa6c7e49b052de7145e3 (diff)
parentbba6bc90bfb86bf729071a732fc63b5588e636dd (diff)
downloadtokio-ee63b7385ebc66b44db9261692b2d749e5910945.tar.gz
Merge "cargo2android: apply patch to Android.bp" am: 714f4488db am: bba6bc90bf
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1652464 Change-Id: I7038033f529fa7ebe74541fea4f075aa18f3297b
-rw-r--r--Android.bp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 1ef8b8f..037a710 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --device --run --features io-util,macros,rt-multi-thread,sync,net,fs,time --tests.
+// This file is generated by cargo2android.py --device --run --features io-util,macros,rt-multi-thread,sync,net,fs,time --tests --patch=patches/Android.bp.patch.
// Do not modify this file as changes will be overridden on upgrade.