From 051340de9ecf67bb645d695886d66866d7ed84cb Mon Sep 17 00:00:00 2001 From: Jason Macnak Date: Sat, 4 Sep 2021 11:04:26 -0700 Subject: [PATCH] Suffix libash with _rust to avoid name conflict Bug: b/189133061 Test: presubmit with attached topic Change-Id: I6619857a7f632fe7ab0576dd0dd0fe4dacf677b1 --- scripts/cargo2android.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/cargo2android.py b/scripts/cargo2android.py index 33ab58455..6a7cb92f0 100755 --- a/scripts/cargo2android.py +++ b/scripts/cargo2android.py @@ -63,6 +63,7 @@ EXCLUDED_CRATES = set(['protobuf_bin_gen_rust_do_not_use']) RENAME_MAP = { # This map includes all changes to the default rust module names # to resolve name conflicts, avoid confusion, or work as plugin. + 'libash': 'libash_rust', 'libbacktrace': 'libbacktrace_rust', 'libbase': 'libbase_rust', 'libbase64': 'libbase64_rust',