diff options
| author | James Farrell <jamesfarrell@google.com> | 2023-09-14 00:41:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-14 00:41:29 +0000 |
| commit | 0af4d0879e8ac61e3889e05f8396dcda27b741b7 (patch) | |
| tree | b9d5d3f4ce470363c251553603d396ba9741baee | |
| parent | 1ce154ca91cccda2be94c1e46f66d03610fec256 (diff) | |
| parent | 1dda66f7c7f5dfb80c24f03a40c366de6b0b0346 (diff) | |
| download | anes-0af4d0879e8ac61e3889e05f8396dcda27b741b7.tar.gz | |
Cleanup cargo2android configs and patches am: 1dda66f7c7
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/anes/+/2751182
Change-Id: If51b6e3c346165dc655206865a5f940feab8e539
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cargo2android.json | 5 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 31 |
2 files changed, 4 insertions, 32 deletions
diff --git a/cargo2android.json b/cargo2android.json index fb02735..eac39f0 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -2,5 +2,8 @@ "device": true, "run": true, "features": "parser", - "tests": true + "tests": true, + "dep-suffixes": { + "bitflags": "-1.3.2" + } } diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff deleted file mode 100644 index 72a6503..0000000 --- a/patches/Android.bp.diff +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index a20fffb..36ba6ab 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -57,7 +57,7 @@ rust_test { - "parser", - ], - rustlibs: [ -- "libbitflags", -+ "libbitflags-1.3.2", - "libcriterion", - "liblibc", - ], -@@ -82,7 +82,7 @@ rust_test { - ], - rustlibs: [ - "libanes", -- "libbitflags", -+ "libbitflags-1.3.2", - "libcriterion", - "liblibc", - ], -@@ -101,7 +101,7 @@ rust_library { - "parser", - ], - rustlibs: [ -- "libbitflags", -+ "libbitflags-1.3.2", - ], - apex_available: [ - "//apex_available:platform", |