commit 6c13b72f15785b0e698520df5f1023aae93b5203
author Chih-Hung Hsieh <chh@google.com> Fri Sep 11 21:24:03 2020 -0700
committer Chih-Hung Hsieh <chh@google.com> Fri Sep 11 21:27:37 2020 -0700
tree e7d00bb4e2fe33db1796c4466b58dc02ccd9c008
parent 82406736296e4ab7f581705db1ad393fcdf4e2f2

Ignore -C codegen-units flag

Test: regenerate .bp files in external/rust/crates/*
Change-Id: I023b0b035d50db9eb7c7462d21beba9b95078378

scripts/cargo2android.py

diff --git a/scripts/cargo2android.py b/scripts/cargo2android.py
index 6af3cde..40d0230 100755
--- a/scripts/cargo2android.py
+++ b/scripts/cargo2android.py
@@ -370,7 +370,9 @@
     # ignore options not used in Android
     # 'prefer-dynamic' does not work with common flag -C lto
     # 'embed-bitcode' is ignored; we might control LTO with other .bp flag
-    if not (flag.startswith('debuginfo=') or
+    # 'codegen-units' is set in Android global config or by default
+    if not (flag.startswith('codegen-units=') or
+            flag.startswith('debuginfo=') or
             flag.startswith('embed-bitcode=') or
             flag.startswith('extra-filename=') or
             flag.startswith('incremental=') or