Merge changes from topic "export-vars"
* changes: export Java variables to Bazel refactor Bazel variable export
This commit is contained in:
Treehugger Robot
Gerrit Code Review
@@ -11,7 +11,6 @@ bootstrap_go_package {
|
||||
"soong-starlark-format",
|
||||
],
|
||||
srcs: [
|
||||
"bp2build.go",
|
||||
"clang.go",
|
||||
"global.go",
|
||||
"tidy.go",
|
||||
@@ -33,7 +32,6 @@ bootstrap_go_package {
|
||||
"arm64_linux_host.go",
|
||||
],
|
||||
testSrcs: [
|
||||
"bp2build_test.go",
|
||||
"tidy_test.go",
|
||||
],
|
||||
}
|
||||
|
||||
@@ -98,28 +98,28 @@ func init() {
|
||||
pctx.SourcePathVariable("Arm64GccRoot",
|
||||
"prebuilts/gcc/${HostPrebuiltTag}/aarch64/aarch64-linux-android-${arm64GccVersion}")
|
||||
|
||||
exportStringListStaticVariable("Arm64Ldflags", arm64Ldflags)
|
||||
exportStringListStaticVariable("Arm64Lldflags", arm64Lldflags)
|
||||
exportedVars.ExportStringListStaticVariable("Arm64Ldflags", arm64Ldflags)
|
||||
exportedVars.ExportStringListStaticVariable("Arm64Lldflags", arm64Lldflags)
|
||||
|
||||
exportStringListStaticVariable("Arm64Cflags", arm64Cflags)
|
||||
exportStringListStaticVariable("Arm64Cppflags", arm64Cppflags)
|
||||
exportedVars.ExportStringListStaticVariable("Arm64Cflags", arm64Cflags)
|
||||
exportedVars.ExportStringListStaticVariable("Arm64Cppflags", arm64Cppflags)
|
||||
|
||||
exportedVariableReferenceDictVars.Set("Arm64ArchVariantCflags", arm64ArchVariantCflagsVar)
|
||||
exportedVariableReferenceDictVars.Set("Arm64CpuVariantCflags", arm64CpuVariantCflagsVar)
|
||||
exportedVariableReferenceDictVars.Set("Arm64CpuVariantLdflags", arm64CpuVariantLdflags)
|
||||
exportedVars.ExportVariableReferenceDict("Arm64ArchVariantCflags", arm64ArchVariantCflagsVar)
|
||||
exportedVars.ExportVariableReferenceDict("Arm64CpuVariantCflags", arm64CpuVariantCflagsVar)
|
||||
exportedVars.ExportVariableReferenceDict("Arm64CpuVariantLdflags", arm64CpuVariantLdflags)
|
||||
|
||||
exportStringListStaticVariable("Arm64Armv8ACflags", arm64ArchVariantCflags["armv8-a"])
|
||||
exportStringListStaticVariable("Arm64Armv8ABranchProtCflags", arm64ArchVariantCflags["armv8-a-branchprot"])
|
||||
exportStringListStaticVariable("Arm64Armv82ACflags", arm64ArchVariantCflags["armv8-2a"])
|
||||
exportStringListStaticVariable("Arm64Armv82ADotprodCflags", arm64ArchVariantCflags["armv8-2a-dotprod"])
|
||||
exportedVars.ExportStringListStaticVariable("Arm64Armv8ACflags", arm64ArchVariantCflags["armv8-a"])
|
||||
exportedVars.ExportStringListStaticVariable("Arm64Armv8ABranchProtCflags", arm64ArchVariantCflags["armv8-a-branchprot"])
|
||||
exportedVars.ExportStringListStaticVariable("Arm64Armv82ACflags", arm64ArchVariantCflags["armv8-2a"])
|
||||
exportedVars.ExportStringListStaticVariable("Arm64Armv82ADotprodCflags", arm64ArchVariantCflags["armv8-2a-dotprod"])
|
||||
|
||||
exportStringListStaticVariable("Arm64CortexA53Cflags", arm64CpuVariantCflags["cortex-a53"])
|
||||
exportStringListStaticVariable("Arm64CortexA55Cflags", arm64CpuVariantCflags["cortex-a55"])
|
||||
exportStringListStaticVariable("Arm64KryoCflags", arm64CpuVariantCflags["kryo"])
|
||||
exportStringListStaticVariable("Arm64ExynosM1Cflags", arm64CpuVariantCflags["exynos-m1"])
|
||||
exportStringListStaticVariable("Arm64ExynosM2Cflags", arm64CpuVariantCflags["exynos-m2"])
|
||||
exportedVars.ExportStringListStaticVariable("Arm64CortexA53Cflags", arm64CpuVariantCflags["cortex-a53"])
|
||||
exportedVars.ExportStringListStaticVariable("Arm64CortexA55Cflags", arm64CpuVariantCflags["cortex-a55"])
|
||||
exportedVars.ExportStringListStaticVariable("Arm64KryoCflags", arm64CpuVariantCflags["kryo"])
|
||||
exportedVars.ExportStringListStaticVariable("Arm64ExynosM1Cflags", arm64CpuVariantCflags["exynos-m1"])
|
||||
exportedVars.ExportStringListStaticVariable("Arm64ExynosM2Cflags", arm64CpuVariantCflags["exynos-m2"])
|
||||
|
||||
exportStringListStaticVariable("Arm64FixCortexA53Ldflags", []string{"-Wl,--fix-cortex-a53-843419"})
|
||||
exportedVars.ExportStringListStaticVariable("Arm64FixCortexA53Ldflags", []string{"-Wl,--fix-cortex-a53-843419"})
|
||||
}
|
||||
|
||||
var (
|
||||
|
||||
@@ -178,41 +178,41 @@ func init() {
|
||||
pctx.SourcePathVariable("ArmGccRoot", "prebuilts/gcc/${HostPrebuiltTag}/arm/arm-linux-androideabi-${armGccVersion}")
|
||||
|
||||
// Just exported. Not created as a Ninja static variable.
|
||||
exportedStringVars.Set("ArmClangTriple", clangTriple)
|
||||
exportedVars.ExportString("ArmClangTriple", clangTriple)
|
||||
|
||||
exportStringListStaticVariable("ArmLdflags", armLdflags)
|
||||
exportStringListStaticVariable("ArmLldflags", armLldflags)
|
||||
exportedVars.ExportStringListStaticVariable("ArmLdflags", armLdflags)
|
||||
exportedVars.ExportStringListStaticVariable("ArmLldflags", armLldflags)
|
||||
|
||||
exportStringListStaticVariable("ArmFixCortexA8LdFlags", armFixCortexA8LdFlags)
|
||||
exportStringListStaticVariable("ArmNoFixCortexA8LdFlags", armNoFixCortexA8LdFlags)
|
||||
exportedVars.ExportStringListStaticVariable("ArmFixCortexA8LdFlags", armFixCortexA8LdFlags)
|
||||
exportedVars.ExportStringListStaticVariable("ArmNoFixCortexA8LdFlags", armNoFixCortexA8LdFlags)
|
||||
|
||||
// Clang cflags
|
||||
exportStringListStaticVariable("ArmToolchainCflags", armToolchainCflags)
|
||||
exportStringListStaticVariable("ArmCflags", armCflags)
|
||||
exportStringListStaticVariable("ArmCppflags", armCppflags)
|
||||
exportedVars.ExportStringListStaticVariable("ArmToolchainCflags", armToolchainCflags)
|
||||
exportedVars.ExportStringListStaticVariable("ArmCflags", armCflags)
|
||||
exportedVars.ExportStringListStaticVariable("ArmCppflags", armCppflags)
|
||||
|
||||
// Clang ARM vs. Thumb instruction set cflags
|
||||
exportStringListStaticVariable("ArmArmCflags", armArmCflags)
|
||||
exportStringListStaticVariable("ArmThumbCflags", armThumbCflags)
|
||||
exportedVars.ExportStringListStaticVariable("ArmArmCflags", armArmCflags)
|
||||
exportedVars.ExportStringListStaticVariable("ArmThumbCflags", armThumbCflags)
|
||||
|
||||
exportedVariableReferenceDictVars.Set("ArmArchVariantCflags", armArchVariantCflagsVar)
|
||||
exportedVariableReferenceDictVars.Set("ArmCpuVariantCflags", armCpuVariantCflagsVar)
|
||||
exportedVars.ExportVariableReferenceDict("ArmArchVariantCflags", armArchVariantCflagsVar)
|
||||
exportedVars.ExportVariableReferenceDict("ArmCpuVariantCflags", armCpuVariantCflagsVar)
|
||||
|
||||
// Clang arch variant cflags
|
||||
exportStringListStaticVariable("ArmArmv7ACflags", armArchVariantCflags["armv7-a"])
|
||||
exportStringListStaticVariable("ArmArmv7ANeonCflags", armArchVariantCflags["armv7-a-neon"])
|
||||
exportStringListStaticVariable("ArmArmv8ACflags", armArchVariantCflags["armv8-a"])
|
||||
exportStringListStaticVariable("ArmArmv82ACflags", armArchVariantCflags["armv8-2a"])
|
||||
exportedVars.ExportStringListStaticVariable("ArmArmv7ACflags", armArchVariantCflags["armv7-a"])
|
||||
exportedVars.ExportStringListStaticVariable("ArmArmv7ANeonCflags", armArchVariantCflags["armv7-a-neon"])
|
||||
exportedVars.ExportStringListStaticVariable("ArmArmv8ACflags", armArchVariantCflags["armv8-a"])
|
||||
exportedVars.ExportStringListStaticVariable("ArmArmv82ACflags", armArchVariantCflags["armv8-2a"])
|
||||
|
||||
// Clang cpu variant cflags
|
||||
exportStringListStaticVariable("ArmGenericCflags", armCpuVariantCflags[""])
|
||||
exportStringListStaticVariable("ArmCortexA7Cflags", armCpuVariantCflags["cortex-a7"])
|
||||
exportStringListStaticVariable("ArmCortexA8Cflags", armCpuVariantCflags["cortex-a8"])
|
||||
exportStringListStaticVariable("ArmCortexA15Cflags", armCpuVariantCflags["cortex-a15"])
|
||||
exportStringListStaticVariable("ArmCortexA53Cflags", armCpuVariantCflags["cortex-a53"])
|
||||
exportStringListStaticVariable("ArmCortexA55Cflags", armCpuVariantCflags["cortex-a55"])
|
||||
exportStringListStaticVariable("ArmKraitCflags", armCpuVariantCflags["krait"])
|
||||
exportStringListStaticVariable("ArmKryoCflags", armCpuVariantCflags["kryo"])
|
||||
exportedVars.ExportStringListStaticVariable("ArmGenericCflags", armCpuVariantCflags[""])
|
||||
exportedVars.ExportStringListStaticVariable("ArmCortexA7Cflags", armCpuVariantCflags["cortex-a7"])
|
||||
exportedVars.ExportStringListStaticVariable("ArmCortexA8Cflags", armCpuVariantCflags["cortex-a8"])
|
||||
exportedVars.ExportStringListStaticVariable("ArmCortexA15Cflags", armCpuVariantCflags["cortex-a15"])
|
||||
exportedVars.ExportStringListStaticVariable("ArmCortexA53Cflags", armCpuVariantCflags["cortex-a53"])
|
||||
exportedVars.ExportStringListStaticVariable("ArmCortexA55Cflags", armCpuVariantCflags["cortex-a55"])
|
||||
exportedVars.ExportStringListStaticVariable("ArmKraitCflags", armCpuVariantCflags["krait"])
|
||||
exportedVars.ExportStringListStaticVariable("ArmKryoCflags", armCpuVariantCflags["kryo"])
|
||||
}
|
||||
|
||||
var (
|
||||
|
||||
@@ -1,378 +0,0 @@
|
||||
// Copyright 2021 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 config
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"reflect"
|
||||
"regexp"
|
||||
"sort"
|
||||
"strings"
|
||||
|
||||
"android/soong/android"
|
||||
"android/soong/starlark_fmt"
|
||||
|
||||
"github.com/google/blueprint"
|
||||
)
|
||||
|
||||
type bazelVarExporter interface {
|
||||
asBazel(android.Config, exportedStringVariables, exportedStringListVariables, exportedConfigDependingVariables) []bazelConstant
|
||||
}
|
||||
|
||||
// Helpers for exporting cc configuration information to Bazel.
|
||||
var (
|
||||
// Maps containing toolchain variables that are independent of the
|
||||
// environment variables of the build.
|
||||
exportedStringListVars = exportedStringListVariables{}
|
||||
exportedStringVars = exportedStringVariables{}
|
||||
exportedStringListDictVars = exportedStringListDictVariables{}
|
||||
// Note: these can only contain references to other variables and must be printed last
|
||||
exportedVariableReferenceDictVars = exportedVariableReferenceDictVariables{}
|
||||
|
||||
/// Maps containing variables that are dependent on the build config.
|
||||
exportedConfigDependingVars = exportedConfigDependingVariables{}
|
||||
)
|
||||
|
||||
type exportedConfigDependingVariables map[string]interface{}
|
||||
|
||||
func (m exportedConfigDependingVariables) Set(k string, v interface{}) {
|
||||
m[k] = v
|
||||
}
|
||||
|
||||
// Ensure that string s has no invalid characters to be generated into the bzl file.
|
||||
func validateCharacters(s string) string {
|
||||
for _, c := range []string{`\n`, `"`, `\`} {
|
||||
if strings.Contains(s, c) {
|
||||
panic(fmt.Errorf("%s contains illegal character %s", s, c))
|
||||
}
|
||||
}
|
||||
return s
|
||||
}
|
||||
|
||||
type bazelConstant struct {
|
||||
variableName string
|
||||
internalDefinition string
|
||||
sortLast bool
|
||||
}
|
||||
|
||||
type exportedStringVariables map[string]string
|
||||
|
||||
func (m exportedStringVariables) Set(k string, v string) {
|
||||
m[k] = v
|
||||
}
|
||||
|
||||
func (m exportedStringVariables) asBazel(config android.Config,
|
||||
stringVars exportedStringVariables, stringListVars exportedStringListVariables, cfgDepVars exportedConfigDependingVariables) []bazelConstant {
|
||||
ret := make([]bazelConstant, 0, len(m))
|
||||
for k, variableValue := range m {
|
||||
expandedVar, err := expandVar(config, variableValue, stringVars, stringListVars, cfgDepVars)
|
||||
if err != nil {
|
||||
panic(fmt.Errorf("error expanding config variable %s: %s", k, err))
|
||||
}
|
||||
if len(expandedVar) > 1 {
|
||||
panic(fmt.Errorf("%s expands to more than one string value: %s", variableValue, expandedVar))
|
||||
}
|
||||
ret = append(ret, bazelConstant{
|
||||
variableName: k,
|
||||
internalDefinition: fmt.Sprintf(`"%s"`, validateCharacters(expandedVar[0])),
|
||||
})
|
||||
}
|
||||
return ret
|
||||
}
|
||||
|
||||
// Convenience function to declare a static variable and export it to Bazel's cc_toolchain.
|
||||
func exportStringStaticVariable(name string, value string) {
|
||||
pctx.StaticVariable(name, value)
|
||||
exportedStringVars.Set(name, value)
|
||||
}
|
||||
|
||||
type exportedStringListVariables map[string][]string
|
||||
|
||||
func (m exportedStringListVariables) Set(k string, v []string) {
|
||||
m[k] = v
|
||||
}
|
||||
|
||||
func (m exportedStringListVariables) asBazel(config android.Config,
|
||||
stringScope exportedStringVariables, stringListScope exportedStringListVariables,
|
||||
exportedVars exportedConfigDependingVariables) []bazelConstant {
|
||||
ret := make([]bazelConstant, 0, len(m))
|
||||
// For each exported variable, recursively expand elements in the variableValue
|
||||
// list to ensure that interpolated variables are expanded according to their values
|
||||
// in the variable scope.
|
||||
for k, variableValue := range m {
|
||||
var expandedVars []string
|
||||
for _, v := range variableValue {
|
||||
expandedVar, err := expandVar(config, v, stringScope, stringListScope, exportedVars)
|
||||
if err != nil {
|
||||
panic(fmt.Errorf("Error expanding config variable %s=%s: %s", k, v, err))
|
||||
}
|
||||
expandedVars = append(expandedVars, expandedVar...)
|
||||
}
|
||||
// Assign the list as a bzl-private variable; this variable will be exported
|
||||
// out through a constants struct later.
|
||||
ret = append(ret, bazelConstant{
|
||||
variableName: k,
|
||||
internalDefinition: starlark_fmt.PrintStringList(expandedVars, 0),
|
||||
})
|
||||
}
|
||||
return ret
|
||||
}
|
||||
|
||||
// Convenience function to declare a static "source path" variable and export it to Bazel's cc_toolchain.
|
||||
func exportVariableConfigMethod(name string, method interface{}) blueprint.Variable {
|
||||
exportedConfigDependingVars.Set(name, method)
|
||||
return pctx.VariableConfigMethod(name, method)
|
||||
}
|
||||
|
||||
// Convenience function to declare a static "source path" variable and export it to Bazel's cc_toolchain.
|
||||
func exportSourcePathVariable(name string, value string) {
|
||||
pctx.SourcePathVariable(name, value)
|
||||
exportedStringVars.Set(name, value)
|
||||
}
|
||||
|
||||
// Convenience function to declare a static variable and export it to Bazel's cc_toolchain.
|
||||
func exportStringListStaticVariable(name string, value []string) {
|
||||
pctx.StaticVariable(name, strings.Join(value, " "))
|
||||
exportedStringListVars.Set(name, value)
|
||||
}
|
||||
|
||||
func ExportStringList(name string, value []string) {
|
||||
exportedStringListVars.Set(name, value)
|
||||
}
|
||||
|
||||
type exportedStringListDictVariables map[string]map[string][]string
|
||||
|
||||
func (m exportedStringListDictVariables) Set(k string, v map[string][]string) {
|
||||
m[k] = v
|
||||
}
|
||||
|
||||
// Since dictionaries are not supported in Ninja, we do not expand variables for dictionaries
|
||||
func (m exportedStringListDictVariables) asBazel(_ android.Config, _ exportedStringVariables,
|
||||
_ exportedStringListVariables, _ exportedConfigDependingVariables) []bazelConstant {
|
||||
ret := make([]bazelConstant, 0, len(m))
|
||||
for k, dict := range m {
|
||||
ret = append(ret, bazelConstant{
|
||||
variableName: k,
|
||||
internalDefinition: starlark_fmt.PrintStringListDict(dict, 0),
|
||||
})
|
||||
}
|
||||
return ret
|
||||
}
|
||||
|
||||
type exportedVariableReferenceDictVariables map[string]map[string]string
|
||||
|
||||
func (m exportedVariableReferenceDictVariables) Set(k string, v map[string]string) {
|
||||
m[k] = v
|
||||
}
|
||||
|
||||
func (m exportedVariableReferenceDictVariables) asBazel(_ android.Config, _ exportedStringVariables,
|
||||
_ exportedStringListVariables, _ exportedConfigDependingVariables) []bazelConstant {
|
||||
ret := make([]bazelConstant, 0, len(m))
|
||||
for n, dict := range m {
|
||||
for k, v := range dict {
|
||||
matches, err := variableReference(v)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
} else if !matches.matches {
|
||||
panic(fmt.Errorf("Expected a variable reference, got %q", v))
|
||||
} else if len(matches.fullVariableReference) != len(v) {
|
||||
panic(fmt.Errorf("Expected only a variable reference, got %q", v))
|
||||
}
|
||||
dict[k] = "_" + matches.variable
|
||||
}
|
||||
ret = append(ret, bazelConstant{
|
||||
variableName: n,
|
||||
internalDefinition: starlark_fmt.PrintDict(dict, 0),
|
||||
sortLast: true,
|
||||
})
|
||||
}
|
||||
return ret
|
||||
}
|
||||
|
||||
// BazelCcToolchainVars generates bzl file content containing variables for
|
||||
// Bazel's cc_toolchain configuration.
|
||||
func BazelCcToolchainVars(config android.Config) string {
|
||||
return bazelToolchainVars(
|
||||
config,
|
||||
exportedStringListDictVars,
|
||||
exportedStringListVars,
|
||||
exportedStringVars,
|
||||
exportedVariableReferenceDictVars)
|
||||
}
|
||||
|
||||
func bazelToolchainVars(config android.Config, vars ...bazelVarExporter) string {
|
||||
ret := "# GENERATED FOR BAZEL FROM SOONG. DO NOT EDIT.\n\n"
|
||||
|
||||
results := []bazelConstant{}
|
||||
for _, v := range vars {
|
||||
results = append(results, v.asBazel(config, exportedStringVars, exportedStringListVars, exportedConfigDependingVars)...)
|
||||
}
|
||||
|
||||
sort.Slice(results, func(i, j int) bool {
|
||||
if results[i].sortLast != results[j].sortLast {
|
||||
return !results[i].sortLast
|
||||
}
|
||||
return results[i].variableName < results[j].variableName
|
||||
})
|
||||
|
||||
definitions := make([]string, 0, len(results))
|
||||
constants := make([]string, 0, len(results))
|
||||
for _, b := range results {
|
||||
definitions = append(definitions,
|
||||
fmt.Sprintf("_%s = %s", b.variableName, b.internalDefinition))
|
||||
constants = append(constants,
|
||||
fmt.Sprintf("%[1]s%[2]s = _%[2]s,", starlark_fmt.Indention(1), b.variableName))
|
||||
}
|
||||
|
||||
// Build the exported constants struct.
|
||||
ret += strings.Join(definitions, "\n\n")
|
||||
ret += "\n\n"
|
||||
ret += "constants = struct(\n"
|
||||
ret += strings.Join(constants, "\n")
|
||||
ret += "\n)"
|
||||
|
||||
return ret
|
||||
}
|
||||
|
||||
type match struct {
|
||||
matches bool
|
||||
fullVariableReference string
|
||||
variable string
|
||||
}
|
||||
|
||||
func variableReference(input string) (match, error) {
|
||||
// e.g. "${ExternalCflags}"
|
||||
r := regexp.MustCompile(`\${(?:config\.)?([a-zA-Z0-9_]+)}`)
|
||||
|
||||
matches := r.FindStringSubmatch(input)
|
||||
if len(matches) == 0 {
|
||||
return match{}, nil
|
||||
}
|
||||
if len(matches) != 2 {
|
||||
return match{}, fmt.Errorf("Expected to only match 1 subexpression in %s, got %d", input, len(matches)-1)
|
||||
}
|
||||
return match{
|
||||
matches: true,
|
||||
fullVariableReference: matches[0],
|
||||
// Index 1 of FindStringSubmatch contains the subexpression match
|
||||
// (variable name) of the capture group.
|
||||
variable: matches[1],
|
||||
}, nil
|
||||
}
|
||||
|
||||
// expandVar recursively expand interpolated variables in the exportedVars scope.
|
||||
//
|
||||
// We're using a string slice to track the seen variables to avoid
|
||||
// stackoverflow errors with infinite recursion. it's simpler to use a
|
||||
// string slice than to handle a pass-by-referenced map, which would make it
|
||||
// quite complex to track depth-first interpolations. It's also unlikely the
|
||||
// interpolation stacks are deep (n > 1).
|
||||
func expandVar(config android.Config, toExpand string, stringScope exportedStringVariables,
|
||||
stringListScope exportedStringListVariables, exportedVars exportedConfigDependingVariables) ([]string, error) {
|
||||
|
||||
// Internal recursive function.
|
||||
var expandVarInternal func(string, map[string]bool) (string, error)
|
||||
expandVarInternal = func(toExpand string, seenVars map[string]bool) (string, error) {
|
||||
var ret string
|
||||
remainingString := toExpand
|
||||
for len(remainingString) > 0 {
|
||||
matches, err := variableReference(remainingString)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !matches.matches {
|
||||
return ret + remainingString, nil
|
||||
}
|
||||
matchIndex := strings.Index(remainingString, matches.fullVariableReference)
|
||||
ret += remainingString[:matchIndex]
|
||||
remainingString = remainingString[matchIndex+len(matches.fullVariableReference):]
|
||||
|
||||
variable := matches.variable
|
||||
// toExpand contains a variable.
|
||||
if _, ok := seenVars[variable]; ok {
|
||||
return ret, fmt.Errorf(
|
||||
"Unbounded recursive interpolation of variable: %s", variable)
|
||||
}
|
||||
// A map is passed-by-reference. Create a new map for
|
||||
// this scope to prevent variables seen in one depth-first expansion
|
||||
// to be also treated as "seen" in other depth-first traversals.
|
||||
newSeenVars := map[string]bool{}
|
||||
for k := range seenVars {
|
||||
newSeenVars[k] = true
|
||||
}
|
||||
newSeenVars[variable] = true
|
||||
if unexpandedVars, ok := stringListScope[variable]; ok {
|
||||
expandedVars := []string{}
|
||||
for _, unexpandedVar := range unexpandedVars {
|
||||
expandedVar, err := expandVarInternal(unexpandedVar, newSeenVars)
|
||||
if err != nil {
|
||||
return ret, err
|
||||
}
|
||||
expandedVars = append(expandedVars, expandedVar)
|
||||
}
|
||||
ret += strings.Join(expandedVars, " ")
|
||||
} else if unexpandedVar, ok := stringScope[variable]; ok {
|
||||
expandedVar, err := expandVarInternal(unexpandedVar, newSeenVars)
|
||||
if err != nil {
|
||||
return ret, err
|
||||
}
|
||||
ret += expandedVar
|
||||
} else if unevaluatedVar, ok := exportedVars[variable]; ok {
|
||||
evalFunc := reflect.ValueOf(unevaluatedVar)
|
||||
validateVariableMethod(variable, evalFunc)
|
||||
evaluatedResult := evalFunc.Call([]reflect.Value{reflect.ValueOf(config)})
|
||||
evaluatedValue := evaluatedResult[0].Interface().(string)
|
||||
expandedVar, err := expandVarInternal(evaluatedValue, newSeenVars)
|
||||
if err != nil {
|
||||
return ret, err
|
||||
}
|
||||
ret += expandedVar
|
||||
} else {
|
||||
return "", fmt.Errorf("Unbound config variable %s", variable)
|
||||
}
|
||||
}
|
||||
return ret, nil
|
||||
}
|
||||
var ret []string
|
||||
for _, v := range strings.Split(toExpand, " ") {
|
||||
val, err := expandVarInternal(v, map[string]bool{})
|
||||
if err != nil {
|
||||
return ret, err
|
||||
}
|
||||
ret = append(ret, val)
|
||||
}
|
||||
|
||||
return ret, nil
|
||||
}
|
||||
|
||||
func validateVariableMethod(name string, methodValue reflect.Value) {
|
||||
methodType := methodValue.Type()
|
||||
if methodType.Kind() != reflect.Func {
|
||||
panic(fmt.Errorf("method given for variable %s is not a function",
|
||||
name))
|
||||
}
|
||||
if n := methodType.NumIn(); n != 1 {
|
||||
panic(fmt.Errorf("method for variable %s has %d inputs (should be 1)",
|
||||
name, n))
|
||||
}
|
||||
if n := methodType.NumOut(); n != 1 {
|
||||
panic(fmt.Errorf("method for variable %s has %d outputs (should be 1)",
|
||||
name, n))
|
||||
}
|
||||
if kind := methodType.Out(0).Kind(); kind != reflect.String {
|
||||
panic(fmt.Errorf("method for variable %s does not return a string",
|
||||
name))
|
||||
}
|
||||
}
|
||||
@@ -1,324 +0,0 @@
|
||||
// Copyright 2021 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 config
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"android/soong/android"
|
||||
)
|
||||
|
||||
func TestExpandVars(t *testing.T) {
|
||||
android_arm64_config := android.TestConfig("out", nil, "", nil)
|
||||
android_arm64_config.BuildOS = android.Android
|
||||
android_arm64_config.BuildArch = android.Arm64
|
||||
|
||||
testCases := []struct {
|
||||
description string
|
||||
config android.Config
|
||||
stringScope exportedStringVariables
|
||||
stringListScope exportedStringListVariables
|
||||
configVars exportedConfigDependingVariables
|
||||
toExpand string
|
||||
expectedValues []string
|
||||
}{
|
||||
{
|
||||
description: "no expansion for non-interpolated value",
|
||||
toExpand: "foo",
|
||||
expectedValues: []string{"foo"},
|
||||
},
|
||||
{
|
||||
description: "single level expansion for string var",
|
||||
stringScope: exportedStringVariables{
|
||||
"foo": "bar",
|
||||
},
|
||||
toExpand: "${foo}",
|
||||
expectedValues: []string{"bar"},
|
||||
},
|
||||
{
|
||||
description: "single level expansion with short-name for string var",
|
||||
stringScope: exportedStringVariables{
|
||||
"foo": "bar",
|
||||
},
|
||||
toExpand: "${config.foo}",
|
||||
expectedValues: []string{"bar"},
|
||||
},
|
||||
{
|
||||
description: "single level expansion string list var",
|
||||
stringListScope: exportedStringListVariables{
|
||||
"foo": []string{"bar"},
|
||||
},
|
||||
toExpand: "${foo}",
|
||||
expectedValues: []string{"bar"},
|
||||
},
|
||||
{
|
||||
description: "mixed level expansion for string list var",
|
||||
stringScope: exportedStringVariables{
|
||||
"foo": "${bar}",
|
||||
"qux": "hello",
|
||||
},
|
||||
stringListScope: exportedStringListVariables{
|
||||
"bar": []string{"baz", "${qux}"},
|
||||
},
|
||||
toExpand: "${foo}",
|
||||
expectedValues: []string{"baz hello"},
|
||||
},
|
||||
{
|
||||
description: "double level expansion",
|
||||
stringListScope: exportedStringListVariables{
|
||||
"foo": []string{"${bar}"},
|
||||
"bar": []string{"baz"},
|
||||
},
|
||||
toExpand: "${foo}",
|
||||
expectedValues: []string{"baz"},
|
||||
},
|
||||
{
|
||||
description: "double level expansion with a literal",
|
||||
stringListScope: exportedStringListVariables{
|
||||
"a": []string{"${b}", "c"},
|
||||
"b": []string{"d"},
|
||||
},
|
||||
toExpand: "${a}",
|
||||
expectedValues: []string{"d c"},
|
||||
},
|
||||
{
|
||||
description: "double level expansion, with two variables in a string",
|
||||
stringListScope: exportedStringListVariables{
|
||||
"a": []string{"${b} ${c}"},
|
||||
"b": []string{"d"},
|
||||
"c": []string{"e"},
|
||||
},
|
||||
toExpand: "${a}",
|
||||
expectedValues: []string{"d e"},
|
||||
},
|
||||
{
|
||||
description: "triple level expansion with two variables in a string",
|
||||
stringListScope: exportedStringListVariables{
|
||||
"a": []string{"${b} ${c}"},
|
||||
"b": []string{"${c}", "${d}"},
|
||||
"c": []string{"${d}"},
|
||||
"d": []string{"foo"},
|
||||
},
|
||||
toExpand: "${a}",
|
||||
expectedValues: []string{"foo foo foo"},
|
||||
},
|
||||
{
|
||||
description: "expansion with config depending vars",
|
||||
configVars: exportedConfigDependingVariables{
|
||||
"a": func(c android.Config) string { return c.BuildOS.String() },
|
||||
"b": func(c android.Config) string { return c.BuildArch.String() },
|
||||
},
|
||||
config: android_arm64_config,
|
||||
toExpand: "${a}-${b}",
|
||||
expectedValues: []string{"android-arm64"},
|
||||
},
|
||||
{
|
||||
description: "double level multi type expansion",
|
||||
stringListScope: exportedStringListVariables{
|
||||
"platform": []string{"${os}-${arch}"},
|
||||
"const": []string{"const"},
|
||||
},
|
||||
configVars: exportedConfigDependingVariables{
|
||||
"os": func(c android.Config) string { return c.BuildOS.String() },
|
||||
"arch": func(c android.Config) string { return c.BuildArch.String() },
|
||||
"foo": func(c android.Config) string { return "foo" },
|
||||
},
|
||||
config: android_arm64_config,
|
||||
toExpand: "${const}/${platform}/${foo}",
|
||||
expectedValues: []string{"const/android-arm64/foo"},
|
||||
},
|
||||
}
|
||||
|
||||
for _, testCase := range testCases {
|
||||
t.Run(testCase.description, func(t *testing.T) {
|
||||
output, _ := expandVar(testCase.config, testCase.toExpand, testCase.stringScope, testCase.stringListScope, testCase.configVars)
|
||||
if len(output) != len(testCase.expectedValues) {
|
||||
t.Errorf("Expected %d values, got %d", len(testCase.expectedValues), len(output))
|
||||
}
|
||||
for i, actual := range output {
|
||||
expectedValue := testCase.expectedValues[i]
|
||||
if actual != expectedValue {
|
||||
t.Errorf("Actual value '%s' doesn't match expected value '%s'", actual, expectedValue)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestBazelToolchainVars(t *testing.T) {
|
||||
testCases := []struct {
|
||||
name string
|
||||
config android.Config
|
||||
vars []bazelVarExporter
|
||||
expectedOut string
|
||||
}{
|
||||
{
|
||||
name: "exports strings",
|
||||
vars: []bazelVarExporter{
|
||||
exportedStringVariables{
|
||||
"a": "b",
|
||||
"c": "d",
|
||||
},
|
||||
},
|
||||
expectedOut: `# GENERATED FOR BAZEL FROM SOONG. DO NOT EDIT.
|
||||
|
||||
_a = "b"
|
||||
|
||||
_c = "d"
|
||||
|
||||
constants = struct(
|
||||
a = _a,
|
||||
c = _c,
|
||||
)`,
|
||||
},
|
||||
{
|
||||
name: "exports string lists",
|
||||
vars: []bazelVarExporter{
|
||||
exportedStringListVariables{
|
||||
"a": []string{"b1", "b2"},
|
||||
"c": []string{"d1", "d2"},
|
||||
},
|
||||
},
|
||||
expectedOut: `# GENERATED FOR BAZEL FROM SOONG. DO NOT EDIT.
|
||||
|
||||
_a = [
|
||||
"b1",
|
||||
"b2",
|
||||
]
|
||||
|
||||
_c = [
|
||||
"d1",
|
||||
"d2",
|
||||
]
|
||||
|
||||
constants = struct(
|
||||
a = _a,
|
||||
c = _c,
|
||||
)`,
|
||||
},
|
||||
{
|
||||
name: "exports string lists dicts",
|
||||
vars: []bazelVarExporter{
|
||||
exportedStringListDictVariables{
|
||||
"a": map[string][]string{"b1": []string{"b2"}},
|
||||
"c": map[string][]string{"d1": []string{"d2"}},
|
||||
},
|
||||
},
|
||||
expectedOut: `# GENERATED FOR BAZEL FROM SOONG. DO NOT EDIT.
|
||||
|
||||
_a = {
|
||||
"b1": ["b2"],
|
||||
}
|
||||
|
||||
_c = {
|
||||
"d1": ["d2"],
|
||||
}
|
||||
|
||||
constants = struct(
|
||||
a = _a,
|
||||
c = _c,
|
||||
)`,
|
||||
},
|
||||
{
|
||||
name: "exports dict with var refs",
|
||||
vars: []bazelVarExporter{
|
||||
exportedVariableReferenceDictVariables{
|
||||
"a": map[string]string{"b1": "${b2}"},
|
||||
"c": map[string]string{"d1": "${config.d2}"},
|
||||
},
|
||||
},
|
||||
expectedOut: `# GENERATED FOR BAZEL FROM SOONG. DO NOT EDIT.
|
||||
|
||||
_a = {
|
||||
"b1": _b2,
|
||||
}
|
||||
|
||||
_c = {
|
||||
"d1": _d2,
|
||||
}
|
||||
|
||||
constants = struct(
|
||||
a = _a,
|
||||
c = _c,
|
||||
)`,
|
||||
},
|
||||
{
|
||||
name: "sorts across types with variable references last",
|
||||
vars: []bazelVarExporter{
|
||||
exportedStringVariables{
|
||||
"b": "b-val",
|
||||
"d": "d-val",
|
||||
},
|
||||
exportedStringListVariables{
|
||||
"c": []string{"c-val"},
|
||||
"e": []string{"e-val"},
|
||||
},
|
||||
exportedStringListDictVariables{
|
||||
"a": map[string][]string{"a1": []string{"a2"}},
|
||||
"f": map[string][]string{"f1": []string{"f2"}},
|
||||
},
|
||||
exportedVariableReferenceDictVariables{
|
||||
"aa": map[string]string{"b1": "${b}"},
|
||||
"cc": map[string]string{"d1": "${config.d}"},
|
||||
},
|
||||
},
|
||||
expectedOut: `# GENERATED FOR BAZEL FROM SOONG. DO NOT EDIT.
|
||||
|
||||
_a = {
|
||||
"a1": ["a2"],
|
||||
}
|
||||
|
||||
_b = "b-val"
|
||||
|
||||
_c = ["c-val"]
|
||||
|
||||
_d = "d-val"
|
||||
|
||||
_e = ["e-val"]
|
||||
|
||||
_f = {
|
||||
"f1": ["f2"],
|
||||
}
|
||||
|
||||
_aa = {
|
||||
"b1": _b,
|
||||
}
|
||||
|
||||
_cc = {
|
||||
"d1": _d,
|
||||
}
|
||||
|
||||
constants = struct(
|
||||
a = _a,
|
||||
b = _b,
|
||||
c = _c,
|
||||
d = _d,
|
||||
e = _e,
|
||||
f = _f,
|
||||
aa = _aa,
|
||||
cc = _cc,
|
||||
)`,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
out := bazelToolchainVars(tc.config, tc.vars...)
|
||||
if out != tc.expectedOut {
|
||||
t.Errorf("Expected \n%s, got \n%s", tc.expectedOut, out)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -23,6 +23,9 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
pctx = android.NewPackageContext("android/soong/cc/config")
|
||||
exportedVars = android.NewExportedVariables(pctx)
|
||||
|
||||
// Flags used by lots of devices. Putting them in package static variables
|
||||
// will save bytes in build.ninja so they aren't repeated for every file
|
||||
commonGlobalCflags = []string{
|
||||
@@ -296,20 +299,28 @@ var (
|
||||
WarningAllowedOldProjects = []string{}
|
||||
)
|
||||
|
||||
var pctx = android.NewPackageContext("android/soong/cc/config")
|
||||
// BazelCcToolchainVars generates bzl file content containing variables for
|
||||
// Bazel's cc_toolchain configuration.
|
||||
func BazelCcToolchainVars(config android.Config) string {
|
||||
return android.BazelToolchainVars(config, exportedVars)
|
||||
}
|
||||
|
||||
func ExportStringList(name string, value []string) {
|
||||
exportedVars.ExportStringList(name, value)
|
||||
}
|
||||
|
||||
func init() {
|
||||
if runtime.GOOS == "linux" {
|
||||
commonGlobalCflags = append(commonGlobalCflags, "-fdebug-prefix-map=/proc/self/cwd=")
|
||||
}
|
||||
|
||||
exportStringListStaticVariable("CommonGlobalConlyflags", commonGlobalConlyflags)
|
||||
exportStringListStaticVariable("DeviceGlobalCppflags", deviceGlobalCppflags)
|
||||
exportStringListStaticVariable("DeviceGlobalLdflags", deviceGlobalLdflags)
|
||||
exportStringListStaticVariable("DeviceGlobalLldflags", deviceGlobalLldflags)
|
||||
exportStringListStaticVariable("HostGlobalCppflags", hostGlobalCppflags)
|
||||
exportStringListStaticVariable("HostGlobalLdflags", hostGlobalLdflags)
|
||||
exportStringListStaticVariable("HostGlobalLldflags", hostGlobalLldflags)
|
||||
exportedVars.ExportStringListStaticVariable("CommonGlobalConlyflags", commonGlobalConlyflags)
|
||||
exportedVars.ExportStringListStaticVariable("DeviceGlobalCppflags", deviceGlobalCppflags)
|
||||
exportedVars.ExportStringListStaticVariable("DeviceGlobalLdflags", deviceGlobalLdflags)
|
||||
exportedVars.ExportStringListStaticVariable("DeviceGlobalLldflags", deviceGlobalLldflags)
|
||||
exportedVars.ExportStringListStaticVariable("HostGlobalCppflags", hostGlobalCppflags)
|
||||
exportedVars.ExportStringListStaticVariable("HostGlobalLdflags", hostGlobalLdflags)
|
||||
exportedVars.ExportStringListStaticVariable("HostGlobalLldflags", hostGlobalLldflags)
|
||||
|
||||
// Export the static default CommonGlobalCflags to Bazel.
|
||||
// TODO(187086342): handle cflags that are set in VariableFuncs.
|
||||
@@ -320,7 +331,7 @@ func init() {
|
||||
"-ftrivial-auto-var-init=zero",
|
||||
"-enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang",
|
||||
}...)
|
||||
exportedStringListVars.Set("CommonGlobalCflags", bazelCommonGlobalCflags)
|
||||
exportedVars.ExportStringList("CommonGlobalCflags", bazelCommonGlobalCflags)
|
||||
|
||||
pctx.VariableFunc("CommonGlobalCflags", func(ctx android.PackageVarContext) string {
|
||||
flags := commonGlobalCflags
|
||||
@@ -349,17 +360,17 @@ func init() {
|
||||
|
||||
// Export the static default DeviceGlobalCflags to Bazel.
|
||||
// TODO(187086342): handle cflags that are set in VariableFuncs.
|
||||
exportedStringListVars.Set("DeviceGlobalCflags", deviceGlobalCflags)
|
||||
exportedVars.ExportStringList("DeviceGlobalCflags", deviceGlobalCflags)
|
||||
|
||||
pctx.VariableFunc("DeviceGlobalCflags", func(ctx android.PackageVarContext) string {
|
||||
return strings.Join(deviceGlobalCflags, " ")
|
||||
})
|
||||
|
||||
exportStringListStaticVariable("HostGlobalCflags", hostGlobalCflags)
|
||||
exportStringListStaticVariable("NoOverrideGlobalCflags", noOverrideGlobalCflags)
|
||||
exportStringListStaticVariable("NoOverrideExternalGlobalCflags", noOverrideExternalGlobalCflags)
|
||||
exportStringListStaticVariable("CommonGlobalCppflags", commonGlobalCppflags)
|
||||
exportStringListStaticVariable("ExternalCflags", extraExternalCflags)
|
||||
exportedVars.ExportStringListStaticVariable("HostGlobalCflags", hostGlobalCflags)
|
||||
exportedVars.ExportStringListStaticVariable("NoOverrideGlobalCflags", noOverrideGlobalCflags)
|
||||
exportedVars.ExportStringListStaticVariable("NoOverrideExternalGlobalCflags", noOverrideExternalGlobalCflags)
|
||||
exportedVars.ExportStringListStaticVariable("CommonGlobalCppflags", commonGlobalCppflags)
|
||||
exportedVars.ExportStringListStaticVariable("ExternalCflags", extraExternalCflags)
|
||||
|
||||
// Everything in these lists is a crime against abstraction and dependency tracking.
|
||||
// Do not add anything to this list.
|
||||
@@ -374,11 +385,11 @@ func init() {
|
||||
"frameworks/native/opengl/include",
|
||||
"frameworks/av/include",
|
||||
}
|
||||
exportedStringListVars.Set("CommonGlobalIncludes", commonGlobalIncludes)
|
||||
exportedVars.ExportStringList("CommonGlobalIncludes", commonGlobalIncludes)
|
||||
pctx.PrefixedExistentPathsForSourcesVariable("CommonGlobalIncludes", "-I", commonGlobalIncludes)
|
||||
|
||||
exportStringStaticVariable("CLANG_DEFAULT_VERSION", ClangDefaultVersion)
|
||||
exportStringStaticVariable("CLANG_DEFAULT_SHORT_VERSION", ClangDefaultShortVersion)
|
||||
exportedVars.ExportStringStaticVariable("CLANG_DEFAULT_VERSION", ClangDefaultVersion)
|
||||
exportedVars.ExportStringStaticVariable("CLANG_DEFAULT_SHORT_VERSION", ClangDefaultShortVersion)
|
||||
|
||||
pctx.StaticVariableWithEnvOverride("ClangBase", "LLVM_PREBUILTS_BASE", ClangDefaultBase)
|
||||
pctx.StaticVariableWithEnvOverride("ClangVersion", "LLVM_PREBUILTS_VERSION", ClangDefaultVersion)
|
||||
@@ -418,7 +429,7 @@ func init() {
|
||||
pctx.StaticVariableWithEnvOverride("REAbiLinkerExecStrategy", "RBE_ABI_LINKER_EXEC_STRATEGY", remoteexec.LocalExecStrategy)
|
||||
}
|
||||
|
||||
var HostPrebuiltTag = exportVariableConfigMethod("HostPrebuiltTag", android.Config.PrebuiltOS)
|
||||
var HostPrebuiltTag = exportedVars.ExportVariableConfigMethod("HostPrebuiltTag", android.Config.PrebuiltOS)
|
||||
|
||||
func ClangPath(ctx android.PathContext, file string) android.SourcePath {
|
||||
type clangToolKey string
|
||||
|
||||
@@ -91,26 +91,26 @@ func init() {
|
||||
pctx.SourcePathVariable("X86_64GccRoot",
|
||||
"prebuilts/gcc/${HostPrebuiltTag}/x86/x86_64-linux-android-${x86_64GccVersion}")
|
||||
|
||||
exportStringListStaticVariable("X86_64ToolchainCflags", []string{"-m64"})
|
||||
exportStringListStaticVariable("X86_64ToolchainLdflags", []string{"-m64"})
|
||||
exportedVars.ExportStringListStaticVariable("X86_64ToolchainCflags", []string{"-m64"})
|
||||
exportedVars.ExportStringListStaticVariable("X86_64ToolchainLdflags", []string{"-m64"})
|
||||
|
||||
exportStringListStaticVariable("X86_64Ldflags", x86_64Ldflags)
|
||||
exportStringListStaticVariable("X86_64Lldflags", x86_64Ldflags)
|
||||
exportedVars.ExportStringListStaticVariable("X86_64Ldflags", x86_64Ldflags)
|
||||
exportedVars.ExportStringListStaticVariable("X86_64Lldflags", x86_64Ldflags)
|
||||
|
||||
// Clang cflags
|
||||
exportStringListStaticVariable("X86_64Cflags", x86_64Cflags)
|
||||
exportStringListStaticVariable("X86_64Cppflags", x86_64Cppflags)
|
||||
exportedVars.ExportStringListStaticVariable("X86_64Cflags", x86_64Cflags)
|
||||
exportedVars.ExportStringListStaticVariable("X86_64Cppflags", x86_64Cppflags)
|
||||
|
||||
// Yasm flags
|
||||
exportStringListStaticVariable("X86_64YasmFlags", []string{
|
||||
exportedVars.ExportStringListStaticVariable("X86_64YasmFlags", []string{
|
||||
"-f elf64",
|
||||
"-m amd64",
|
||||
})
|
||||
|
||||
// Extended cflags
|
||||
|
||||
exportedStringListDictVars.Set("X86_64ArchVariantCflags", x86_64ArchVariantCflags)
|
||||
exportedStringListDictVars.Set("X86_64ArchFeatureCflags", x86_64ArchFeatureCflags)
|
||||
exportedVars.ExportStringListDict("X86_64ArchVariantCflags", x86_64ArchVariantCflags)
|
||||
exportedVars.ExportStringListDict("X86_64ArchFeatureCflags", x86_64ArchFeatureCflags)
|
||||
|
||||
// Architecture variant cflags
|
||||
for variant, cflags := range x86_64ArchVariantCflags {
|
||||
|
||||
@@ -98,25 +98,25 @@ func init() {
|
||||
pctx.SourcePathVariable("X86GccRoot",
|
||||
"prebuilts/gcc/${HostPrebuiltTag}/x86/x86_64-linux-android-${x86GccVersion}")
|
||||
|
||||
exportStringListStaticVariable("X86ToolchainCflags", []string{"-m32"})
|
||||
exportStringListStaticVariable("X86ToolchainLdflags", []string{"-m32"})
|
||||
exportedVars.ExportStringListStaticVariable("X86ToolchainCflags", []string{"-m32"})
|
||||
exportedVars.ExportStringListStaticVariable("X86ToolchainLdflags", []string{"-m32"})
|
||||
|
||||
exportStringListStaticVariable("X86Ldflags", x86Ldflags)
|
||||
exportStringListStaticVariable("X86Lldflags", x86Ldflags)
|
||||
exportedVars.ExportStringListStaticVariable("X86Ldflags", x86Ldflags)
|
||||
exportedVars.ExportStringListStaticVariable("X86Lldflags", x86Ldflags)
|
||||
|
||||
// Clang cflags
|
||||
exportStringListStaticVariable("X86Cflags", x86Cflags)
|
||||
exportStringListStaticVariable("X86Cppflags", x86Cppflags)
|
||||
exportedVars.ExportStringListStaticVariable("X86Cflags", x86Cflags)
|
||||
exportedVars.ExportStringListStaticVariable("X86Cppflags", x86Cppflags)
|
||||
|
||||
// Yasm flags
|
||||
exportStringListStaticVariable("X86YasmFlags", []string{
|
||||
exportedVars.ExportStringListStaticVariable("X86YasmFlags", []string{
|
||||
"-f elf32",
|
||||
"-m x86",
|
||||
})
|
||||
|
||||
// Extended cflags
|
||||
exportedStringListDictVars.Set("X86ArchVariantCflags", x86ArchVariantCflags)
|
||||
exportedStringListDictVars.Set("X86ArchFeatureCflags", x86ArchFeatureCflags)
|
||||
exportedVars.ExportStringListDict("X86ArchVariantCflags", x86ArchVariantCflags)
|
||||
exportedVars.ExportStringListDict("X86ArchFeatureCflags", x86ArchFeatureCflags)
|
||||
|
||||
// Architecture variant cflags
|
||||
for variant, cflags := range x86ArchVariantCflags {
|
||||
|
||||
@@ -121,40 +121,40 @@ const (
|
||||
)
|
||||
|
||||
func init() {
|
||||
exportStringStaticVariable("LinuxGccVersion", linuxGccVersion)
|
||||
exportStringStaticVariable("LinuxGlibcVersion", linuxGlibcVersion)
|
||||
exportedVars.ExportStringStaticVariable("LinuxGccVersion", linuxGccVersion)
|
||||
exportedVars.ExportStringStaticVariable("LinuxGlibcVersion", linuxGlibcVersion)
|
||||
|
||||
// Most places use the full GCC version. A few only use up to the first two numbers.
|
||||
if p := strings.Split(linuxGccVersion, "."); len(p) > 2 {
|
||||
exportStringStaticVariable("ShortLinuxGccVersion", strings.Join(p[:2], "."))
|
||||
exportedVars.ExportStringStaticVariable("ShortLinuxGccVersion", strings.Join(p[:2], "."))
|
||||
} else {
|
||||
exportStringStaticVariable("ShortLinuxGccVersion", linuxGccVersion)
|
||||
exportedVars.ExportStringStaticVariable("ShortLinuxGccVersion", linuxGccVersion)
|
||||
}
|
||||
|
||||
exportSourcePathVariable("LinuxGccRoot",
|
||||
exportedVars.ExportSourcePathVariable("LinuxGccRoot",
|
||||
"prebuilts/gcc/linux-x86/host/x86_64-linux-glibc${LinuxGlibcVersion}-${ShortLinuxGccVersion}")
|
||||
|
||||
exportStringListStaticVariable("LinuxGccTriple", []string{"x86_64-linux"})
|
||||
exportedVars.ExportStringListStaticVariable("LinuxGccTriple", []string{"x86_64-linux"})
|
||||
|
||||
exportStringListStaticVariable("LinuxCflags", linuxCflags)
|
||||
exportStringListStaticVariable("LinuxLdflags", linuxLdflags)
|
||||
exportStringListStaticVariable("LinuxLldflags", linuxLdflags)
|
||||
exportStringListStaticVariable("LinuxGlibcCflags", linuxGlibcCflags)
|
||||
exportStringListStaticVariable("LinuxGlibcLdflags", linuxGlibcLdflags)
|
||||
exportStringListStaticVariable("LinuxGlibcLldflags", linuxGlibcLdflags)
|
||||
exportStringListStaticVariable("LinuxMuslCflags", linuxMuslCflags)
|
||||
exportStringListStaticVariable("LinuxMuslLdflags", linuxMuslLdflags)
|
||||
exportStringListStaticVariable("LinuxMuslLldflags", linuxMuslLdflags)
|
||||
exportedVars.ExportStringListStaticVariable("LinuxCflags", linuxCflags)
|
||||
exportedVars.ExportStringListStaticVariable("LinuxLdflags", linuxLdflags)
|
||||
exportedVars.ExportStringListStaticVariable("LinuxLldflags", linuxLdflags)
|
||||
exportedVars.ExportStringListStaticVariable("LinuxGlibcCflags", linuxGlibcCflags)
|
||||
exportedVars.ExportStringListStaticVariable("LinuxGlibcLdflags", linuxGlibcLdflags)
|
||||
exportedVars.ExportStringListStaticVariable("LinuxGlibcLldflags", linuxGlibcLdflags)
|
||||
exportedVars.ExportStringListStaticVariable("LinuxMuslCflags", linuxMuslCflags)
|
||||
exportedVars.ExportStringListStaticVariable("LinuxMuslLdflags", linuxMuslLdflags)
|
||||
exportedVars.ExportStringListStaticVariable("LinuxMuslLldflags", linuxMuslLdflags)
|
||||
|
||||
exportStringListStaticVariable("LinuxX86Cflags", linuxX86Cflags)
|
||||
exportStringListStaticVariable("LinuxX8664Cflags", linuxX8664Cflags)
|
||||
exportStringListStaticVariable("LinuxX86Ldflags", linuxX86Ldflags)
|
||||
exportStringListStaticVariable("LinuxX86Lldflags", linuxX86Ldflags)
|
||||
exportStringListStaticVariable("LinuxX8664Ldflags", linuxX8664Ldflags)
|
||||
exportStringListStaticVariable("LinuxX8664Lldflags", linuxX8664Ldflags)
|
||||
exportedVars.ExportStringListStaticVariable("LinuxX86Cflags", linuxX86Cflags)
|
||||
exportedVars.ExportStringListStaticVariable("LinuxX8664Cflags", linuxX8664Cflags)
|
||||
exportedVars.ExportStringListStaticVariable("LinuxX86Ldflags", linuxX86Ldflags)
|
||||
exportedVars.ExportStringListStaticVariable("LinuxX86Lldflags", linuxX86Ldflags)
|
||||
exportedVars.ExportStringListStaticVariable("LinuxX8664Ldflags", linuxX8664Ldflags)
|
||||
exportedVars.ExportStringListStaticVariable("LinuxX8664Lldflags", linuxX8664Ldflags)
|
||||
// Yasm flags
|
||||
exportStringListStaticVariable("LinuxX86YasmFlags", []string{"-f elf32 -m x86"})
|
||||
exportStringListStaticVariable("LinuxX8664YasmFlags", []string{"-f elf64 -m amd64"})
|
||||
exportedVars.ExportStringListStaticVariable("LinuxX86YasmFlags", []string{"-f elf32 -m x86"})
|
||||
exportedVars.ExportStringListStaticVariable("LinuxX8664YasmFlags", []string{"-f elf64 -m amd64"})
|
||||
}
|
||||
|
||||
type toolchainLinux struct {
|
||||
|
||||
Reference in New Issue
Block a user