Merge "Ignore -C codegen-units flag" am: 2bbb98ad2f am: 10987326b1 am: 2024e0ff67

Original change: https://android-review.googlesource.com/c/platform/development/+/1426187

Change-Id: I3afbdadac47bf9e2b66fb1287357299e67ccb99a
This commit is contained in:
Chih-hung Hsieh
2020-09-14 23:28:41 +00:00
committed by Automerger Merge Worker

View File

@@ -370,7 +370,9 @@ class Crate(object):
# 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