28344528cf
Reduce the number of flags variables when compiling C by getting rid of the separately-tracked IncludeDirs variables, and putting them directly in GlobalFlags. Also changes exportedIncludeDirs to exportedFlags, which will allow exporting flags besides -I. Also fixes a bug when building a module with the NDK and -Werror by passing NDK exported include directories with -isystem instead of -I, which will ignore warnings from those includes. Also fixes a bug where the default includes were being inserted into all cflags by the arm and arm64 toolchain modules. Change-Id: Ice97f84e637b21d20c38c85b881afa315f9f92ae
84 lines
2.2 KiB
Go
84 lines
2.2 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/common"
|
|
)
|
|
|
|
// Efficiently converts a list of include directories to a single string
|
|
// of cflags with -I prepended to each directory.
|
|
func includeDirsToFlags(dirs []string) string {
|
|
return common.JoinWithPrefix(dirs, "-I")
|
|
}
|
|
|
|
func ldDirsToFlags(dirs []string) string {
|
|
return common.JoinWithPrefix(dirs, "-L")
|
|
}
|
|
|
|
func libNamesToFlags(names []string) string {
|
|
return common.JoinWithPrefix(names, "-l")
|
|
}
|
|
|
|
func inList(s string, list []string) bool {
|
|
for _, l := range list {
|
|
if l == s {
|
|
return true
|
|
}
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
func filterList(list []string, filter []string) (remainder []string, filtered []string) {
|
|
for _, l := range list {
|
|
if inList(l, filter) {
|
|
filtered = append(filtered, l)
|
|
} else {
|
|
remainder = append(remainder, l)
|
|
}
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
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 ccFlagsToBuilderFlags(in CCFlags) builderFlags {
|
|
return builderFlags{
|
|
globalFlags: strings.Join(in.GlobalFlags, " "),
|
|
asFlags: strings.Join(in.AsFlags, " "),
|
|
cFlags: strings.Join(in.CFlags, " "),
|
|
conlyFlags: strings.Join(in.ConlyFlags, " "),
|
|
cppFlags: strings.Join(in.CppFlags, " "),
|
|
yaccFlags: strings.Join(in.YaccFlags, " "),
|
|
ldFlags: strings.Join(in.LdFlags, " "),
|
|
nocrt: in.Nocrt,
|
|
toolchain: in.Toolchain,
|
|
clang: in.Clang,
|
|
}
|
|
}
|