diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-06-03 20:42:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-03 20:42:39 +0000 |
| commit | fe9af506990f482a5e896d9fcb0a201998d416d9 (patch) | |
| tree | b2640ccd40040ff4ddeb5ac349b8dfaf7a5b4cf8 | |
| parent | c9e1025196b802e60860ff6082cb78f7edb0aa9b (diff) | |
| parent | d118dad1e41fd5cac2738190be55a5d5c4f46121 (diff) | |
| download | memoffset-fe9af506990f482a5e896d9fcb0a201998d416d9.tar.gz | |
Use new c2a functionality instead of a patch. am: 9476e94ee4 am: d118dad1e4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/memoffset/+/1725953
Change-Id: If735836e6620c85ca6e89b2f11b52eeaa90bfe88
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | cargo2android.json | 4 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 14 |
3 files changed, 3 insertions, 19 deletions
@@ -53,10 +53,6 @@ rust_defaults { "raw_ref_macros", "tuple_ty", ], - rustlibs: [ - // ANDROID: disable for now just to avoid another dependency. - //"libdoc_comment", - ], } rust_test_host { diff --git a/cargo2android.json b/cargo2android.json index 0f253f0..29665bb 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -4,8 +4,10 @@ "com.android.virt" ], "dependencies": true, + "dependency-blocklist": [ + "doc_comment" + ], "device": true, - "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 96c3e12..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index eb63f7c..efa8362 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -48,7 +52,8 @@ rust_defaults { - "--cfg tuple_ty", - ], - rustlibs: [ -- "libdoc_comment", -+ // ANDROID: disable for now just to avoid another dependency. -+ //"libdoc_comment", - ], - } - |