diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-09-21 22:01:31 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-09-21 22:01:31 +0000 |
| commit | 92e3c3cbe4d2ea22a3513d5f5b0dae6758a11d33 (patch) | |
| tree | b461f96f118c664baf02c2d32cedbd6a9f006848 | |
| parent | 33cabdfa3e5c30aafd3f245668375b5cb6957be3 (diff) | |
| parent | ef89dc37bd20fe0d5a003d464b8a034408fb5e1f (diff) | |
| download | gdbstub-92e3c3cbe4d2ea22a3513d5f5b0dae6758a11d33.tar.gz | |
Snap for 10843824 from ef89dc37bd20fe0d5a003d464b8a034408fb5e1f to 24Q1-release
Change-Id: I51b0550b64e189373da2accfd1e18f0d0e1d9b64
| -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", |