Initial support for the android wrapper.
BUG=chromium:773875
TEST=golden tests and comparison against old andorid wrapper.
Change-Id: Ic11be4bc1399adcbf9c50134928aceda45e936ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1831787
Tested-by: Tobias Bosch <tbosch@google.com>
Reviewed-by: George Burgess <gbiv@chromium.org>
diff --git a/compiler_wrapper/compiler_wrapper.go b/compiler_wrapper/compiler_wrapper.go
index c394b76..899a85c 100644
--- a/compiler_wrapper/compiler_wrapper.go
+++ b/compiler_wrapper/compiler_wrapper.go
@@ -126,7 +126,7 @@
func prepareClangCommand(builder *commandBuilder) (sysroot string, err error) {
sysroot = ""
- if !builder.cfg.isHostWrapper {
+ if !builder.cfg.isHostWrapper && !builder.cfg.isAndroidWrapper {
sysroot = processSysrootFlag(builder)
}
builder.addPreUserArgs(builder.cfg.clangFlags...)
@@ -165,13 +165,15 @@
func calcCommonPreUserArgs(builder *commandBuilder) {
builder.addPreUserArgs(builder.cfg.commonFlags...)
- if !builder.cfg.isHostWrapper {
+ if !builder.cfg.isHostWrapper && !builder.cfg.isAndroidWrapper {
processPieFlags(builder)
processThumbCodeFlags(builder)
processStackProtectorFlags(builder)
processX86Flags(builder)
}
- processSanitizerFlags(builder)
+ if !builder.cfg.isAndroidWrapper {
+ processSanitizerFlags(builder)
+ }
}
func processGomaCCacheFlags(sysroot string, allowCCache bool, builder *commandBuilder) {