diff options
| author | James Farrell <jamesfarrell@google.com> | 2023-09-13 18:54:11 +0000 |
|---|---|---|
| committer | James Farrell <jamesfarrell@google.com> | 2023-09-13 18:54:11 +0000 |
| commit | 2630d6857af07679a7ddf72d64a24adf3532af7a (patch) | |
| tree | b461f96f118c664baf02c2d32cedbd6a9f006848 | |
| parent | 4a42beab07ab725ccdd78546aa48778f82087b15 (diff) | |
| download | gdbstub-2630d6857af07679a7ddf72d64a24adf3532af7a.tar.gz | |
Cleanup cargo2android configs and patches
Use name-suffix and dep-suffixes (aosp/2751102) and remove patches no longer needed as a result. Other minor cleanups to eliminate diffs in Android.bp files
Test: Ran cargo2android
Change-Id: I6c7341ba04d54ff0b4d5a81ffab1663c5913473e
| -rw-r--r-- | cargo2android.json | 7 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 13 |
2 files changed, 5 insertions, 15 deletions
diff --git a/cargo2android.json b/cargo2android.json index 84da6ae..5e354da 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,5 +1,8 @@ { "device": true, "no-subdir": true, - "run": true -}
\ No newline at end of file + "run": true, + "dep-suffixes": { + "bitflags": "-1.3.2" + } +} diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff deleted file mode 100644 index 46edb51..0000000 --- a/patches/Android.bp.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 873b4d1..a241d18 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -33,7 +33,7 @@ rust_library { - "trace-pkt", - ], - rustlibs: [ -- "libbitflags", -+ "libbitflags-1.3.2", - "libcfg_if", - "liblog_rust", - "libmanaged", |