diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-06-09 23:10:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-09 23:10:29 +0000 |
| commit | 843e091cfa2b990fe13a544d4f9a7cc94b7ea080 (patch) | |
| tree | 3ee0b1e05e18a18d5e9b997653febaa2dc4f098b | |
| parent | 0508ccd77663713347040e849ad3e1fc97bf495d (diff) | |
| parent | 538c631506912f7ac70878d9a6731a74a5081a9c (diff) | |
| download | spin-843e091cfa2b990fe13a544d4f9a7cc94b7ea080.tar.gz | |
Remove patch am: 05c81a6f3f am: 538c631506
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/spin/+/1729177
Change-Id: Ifdbc629179dcd0c61af95ccf9bd61384af613724
| -rw-r--r-- | cargo2android.json | 2 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 20 |
2 files changed, 1 insertions, 21 deletions
diff --git a/cargo2android.json b/cargo2android.json index 5441827..53480b8 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -5,8 +5,8 @@ ], "dependencies": true, "device": true, + "features": "default,std", "min-sdk-version": "29", - "patch": "patches/Android.bp.patch", "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 f606cb9..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 96531ab..43db8ef 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -39,6 +39,7 @@ rust_library { - edition: "2015", - features: [ - "default", -+ "std", - "ticket_mutex", - ], - apex_available: [ -@@ -56,6 +62,7 @@ rust_defaults { - edition: "2015", - features: [ - "default", -+ "std", - "ticket_mutex", - ], - } |