51be632b95
LLVM-AR does not allow passing --plugin options more than once. The
--plugin ARFLAGS that lto want to add, may already exist if sanitizer is
also turned on.
Fixed this by adding a new bool Flags.ArGoldPlugin. Set this variable to
true whenever LLVM gold plugin is needed for ArFlags. In function
TransformObjToStaticLib(), add this option to arFlags using global value
${config.LLVMGoldPlugin} if the bool value is true.
Bug: http://b/73160350
Test: build the image with make and succeeded.
Change-Id: I62785829b0a4b663225926e4aed98defc1b6da2c
(cherry picked from commit 4917049f6e)
103 lines
3.1 KiB
Go
103 lines
3.1 KiB
Go
// Copyright 2015 Google Inc. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package cc
|
|
|
|
import (
|
|
"fmt"
|
|
"regexp"
|
|
"strings"
|
|
|
|
"android/soong/android"
|
|
)
|
|
|
|
// Efficiently converts a list of include directories to a single string
|
|
// of cflags with -I prepended to each directory.
|
|
func includeDirsToFlags(dirs android.Paths) string {
|
|
return android.JoinWithPrefix(dirs.Strings(), "-I")
|
|
}
|
|
|
|
func includeFilesToFlags(files android.Paths) string {
|
|
return android.JoinWithPrefix(files.Strings(), "-include ")
|
|
}
|
|
|
|
func ldDirsToFlags(dirs []string) string {
|
|
return android.JoinWithPrefix(dirs, "-L")
|
|
}
|
|
|
|
func libNamesToFlags(names []string) string {
|
|
return android.JoinWithPrefix(names, "-l")
|
|
}
|
|
|
|
var indexList = android.IndexList
|
|
var inList = android.InList
|
|
var filterList = android.FilterList
|
|
var removeListFromList = android.RemoveListFromList
|
|
var removeFromList = android.RemoveFromList
|
|
|
|
var libNameRegexp = regexp.MustCompile(`^lib(.*)$`)
|
|
|
|
func moduleToLibName(module string) (string, error) {
|
|
matches := libNameRegexp.FindStringSubmatch(module)
|
|
if matches == nil {
|
|
return "", fmt.Errorf("Library module name %s does not start with lib", module)
|
|
}
|
|
return matches[1], nil
|
|
}
|
|
|
|
func flagsToBuilderFlags(in Flags) builderFlags {
|
|
return builderFlags{
|
|
globalFlags: strings.Join(in.GlobalFlags, " "),
|
|
arFlags: strings.Join(in.ArFlags, " "),
|
|
asFlags: strings.Join(in.AsFlags, " "),
|
|
cFlags: strings.Join(in.CFlags, " "),
|
|
toolingCFlags: strings.Join(in.ToolingCFlags, " "),
|
|
conlyFlags: strings.Join(in.ConlyFlags, " "),
|
|
cppFlags: strings.Join(in.CppFlags, " "),
|
|
yaccFlags: strings.Join(in.YaccFlags, " "),
|
|
protoFlags: strings.Join(in.protoFlags, " "),
|
|
protoOutParams: strings.Join(in.protoOutParams, ":"),
|
|
aidlFlags: strings.Join(in.aidlFlags, " "),
|
|
rsFlags: strings.Join(in.rsFlags, " "),
|
|
ldFlags: strings.Join(in.LdFlags, " "),
|
|
libFlags: strings.Join(in.libFlags, " "),
|
|
tidyFlags: strings.Join(in.TidyFlags, " "),
|
|
sAbiFlags: strings.Join(in.SAbiFlags, " "),
|
|
yasmFlags: strings.Join(in.YasmFlags, " "),
|
|
toolchain: in.Toolchain,
|
|
clang: in.Clang,
|
|
coverage: in.Coverage,
|
|
tidy: in.Tidy,
|
|
sAbiDump: in.SAbiDump,
|
|
|
|
systemIncludeFlags: strings.Join(in.SystemIncludeFlags, " "),
|
|
|
|
groupStaticLibs: in.GroupStaticLibs,
|
|
arGoldPlugin: in.ArGoldPlugin,
|
|
}
|
|
}
|
|
|
|
func addPrefix(list []string, prefix string) []string {
|
|
for i := range list {
|
|
list[i] = prefix + list[i]
|
|
}
|
|
return list
|
|
}
|
|
|
|
func addSuffix(list []string, suffix string) []string {
|
|
for i := range list {
|
|
list[i] = list[i] + suffix
|
|
}
|
|
return list
|
|
}
|