StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cc: export structs and add ModifyProperties

Browse Source 
Instead of the complicated Flags and DepNames system used now
for overriding CC modules, export all the main structs and the
properties structs so that module types that override them can
modify properties before build rule generation starts.

Change-Id: I6d71550def1ef07798b27d5fec40739ef3ac8165
This commit is contained in:
Colin Cross
2015-04-24 17:31:52 -07:00
parent 28344528cf
commit fa1387916f
1 changed files with 227 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

314
cc/cc.go
View File

@@ -104,8 +104,61 @@ func init() {
pctx.StaticVariable("clangPath", "${SrcDir}/prebuilts/clang/${HostPrebuiltTag}/host/3.6/bin/") pctx.StaticVariable("clangPath", "${SrcDir}/prebuilts/clang/${HostPrebuiltTag}/host/3.6/bin/")
} }
// ccProperties describes properties used to compile all C or C++ modules // Building C/C++ code is handled by objects that satisfy this interface via composition
type ccProperties struct { type CCModuleType interface {
common.AndroidModule
// Modify property values after parsing Blueprints file but before starting dependency
// resolution or build rule generation
ModifyProperties(common.AndroidBaseContext)
// Modify the ccFlags
Flags(common.AndroidModuleContext, CCFlags) CCFlags
// Return list of dependency names for use in AndroidDynamicDependencies and in depsToPaths
DepNames(common.AndroidBaseContext, CCDeps) CCDeps
// Compile objects into final module
compileModule(common.AndroidModuleContext, CCFlags, CCDeps, []string)
// Install the built module.
installModule(common.AndroidModuleContext, CCFlags)
// Return the output file (.o, .a or .so) for use by other modules
outputFile() string
}
type CCDeps struct {
StaticLibs, SharedLibs, LateStaticLibs, WholeStaticLibs, ObjFiles, Cflags []string
WholeStaticLibObjFiles []string
CrtBegin, CrtEnd string
}
type CCFlags struct {
GlobalFlags []string // Flags that apply to C, C++, and assembly source files
AsFlags []string // Flags that apply to assembly source files
CFlags []string // Flags that apply to C and C++ source files
ConlyFlags []string // Flags that apply to C source files
CppFlags []string // Flags that apply to C++ source files
YaccFlags []string // Flags that apply to Yacc source files
LdFlags []string // Flags that apply to linker command lines
Nocrt bool
Toolchain Toolchain
Clang bool
}
// CCBase contains the properties and members used by all C/C++ module types, and implements
// the blueprint.Module interface. It expects to be embedded into an outer specialization struct,
// and uses a ccModuleType interface to that struct to create the build steps.
type CCBase struct {
common.AndroidModuleBase
module CCModuleType
// Properties used to compile all C or C++ modules
Properties struct {
// srcs: list of source files used to compile the C/C++ module. May be .c, .cpp, or .S files. // srcs: list of source files used to compile the C/C++ module. May be .c, .cpp, or .S files.
Srcs []string `android:"arch_variant,arch_subtract"` Srcs []string `android:"arch_variant,arch_subtract"`
@@ -214,82 +267,30 @@ type ccProperties struct {
// relative_install_path: install to a subdirectory of the default install path for the module // relative_install_path: install to a subdirectory of the default install path for the module
Relative_install_path string Relative_install_path string
} }
type unusedProperties struct { unused struct {
Asan bool Asan bool
Native_coverage bool Native_coverage bool
Strip string Strip string
Tags []string Tags []string
Required []string Required []string
} }
// Building C/C++ code is handled by objects that satisfy this interface via composition
type CCModuleType interface {
common.AndroidModule
// Modify the ccFlags
Flags(common.AndroidModuleContext, CCFlags) CCFlags
// Return list of dependency names for use in AndroidDynamicDependencies and in depsToPaths
DepNames(common.AndroidBaseContext, CCDeps) CCDeps
// Compile objects into final module
compileModule(common.AndroidModuleContext, CCFlags, CCDeps, []string)
// Install the built module.
installModule(common.AndroidModuleContext, CCFlags)
// Return the output file (.o, .a or .so) for use by other modules
outputFile() string
}
type CCDeps struct {
StaticLibs, SharedLibs, LateStaticLibs, WholeStaticLibs, ObjFiles, Cflags []string
WholeStaticLibObjFiles []string
CrtBegin, CrtEnd string
}
type CCFlags struct {
GlobalFlags []string // Flags that apply to C, C++, and assembly source files
AsFlags []string // Flags that apply to assembly source files
CFlags []string // Flags that apply to C and C++ source files
ConlyFlags []string // Flags that apply to C source files
CppFlags []string // Flags that apply to C++ source files
YaccFlags []string // Flags that apply to Yacc source files
LdFlags []string // Flags that apply to linker command lines
Nocrt bool
Toolchain Toolchain
Clang bool
}
// ccBase contains the properties and members used by all C/C++ module types, and implements
// the blueprint.Module interface. It expects to be embedded into an outer specialization struct,
// and uses a ccModuleType interface to that struct to create the build steps.
type ccBase struct {
common.AndroidModuleBase
module CCModuleType
properties ccProperties
unused unusedProperties
installPath string installPath string
} }
func newCCBase(base *ccBase, module CCModuleType, hod common.HostOrDeviceSupported, func newCCBase(base *CCBase, module CCModuleType, hod common.HostOrDeviceSupported,
multilib common.Multilib, props ...interface{}) (blueprint.Module, []interface{}) { multilib common.Multilib, props ...interface{}) (blueprint.Module, []interface{}) {
base.module = module base.module = module
props = append(props, &base.properties, &base.unused) props = append(props, &base.Properties, &base.unused)
return common.InitAndroidArchModule(module, hod, multilib, props...) return common.InitAndroidArchModule(module, hod, multilib, props...)
} }
func (c *ccBase) GenerateAndroidBuildActions(ctx common.AndroidModuleContext) { func (c *CCBase) GenerateAndroidBuildActions(ctx common.AndroidModuleContext) {
toolchain := c.findToolchain(ctx) toolchain := c.findToolchain(ctx)
if ctx.Failed() { if ctx.Failed() {
return return
@@ -335,13 +336,13 @@ func (c *ccBase) GenerateAndroidBuildActions(ctx common.AndroidModuleContext) {
} }
} }
func (c *ccBase) ccModuleType() CCModuleType { func (c *CCBase) ccModuleType() CCModuleType {
return c.module return c.module
} }
var _ common.AndroidDynamicDepender = (*ccBase)(nil) var _ common.AndroidDynamicDepender = (*CCBase)(nil)
func (c *ccBase) findToolchain(ctx common.AndroidModuleContext) Toolchain { func (c *CCBase) findToolchain(ctx common.AndroidModuleContext) Toolchain {
arch := ctx.Arch() arch := ctx.Arch()
factory := toolchainFactories[arch.HostOrDevice][arch.ArchType] factory := toolchainFactories[arch.HostOrDevice][arch.ArchType]
if factory == nil { if factory == nil {
@@ -351,15 +352,20 @@ func (c *ccBase) findToolchain(ctx common.AndroidModuleContext) Toolchain {
return factory(arch.ArchVariant, arch.CpuVariant) return factory(arch.ArchVariant, arch.CpuVariant)
} }
func (c *ccBase) DepNames(ctx common.AndroidBaseContext, depNames CCDeps) CCDeps { func (c *CCBase) ModifyProperties(ctx common.AndroidBaseContext) {
depNames.WholeStaticLibs = append(depNames.WholeStaticLibs, c.properties.Whole_static_libs...) }
depNames.StaticLibs = append(depNames.StaticLibs, c.properties.Static_libs...)
depNames.SharedLibs = append(depNames.SharedLibs, c.properties.Shared_libs...) func (c *CCBase) DepNames(ctx common.AndroidBaseContext, depNames CCDeps) CCDeps {
depNames.WholeStaticLibs = append(depNames.WholeStaticLibs, c.Properties.Whole_static_libs...)
depNames.StaticLibs = append(depNames.StaticLibs, c.Properties.Static_libs...)
depNames.SharedLibs = append(depNames.SharedLibs, c.Properties.Shared_libs...)
return depNames return depNames
} }
func (c *ccBase) AndroidDynamicDependencies(ctx common.AndroidDynamicDependerModuleContext) []string { func (c *CCBase) AndroidDynamicDependencies(ctx common.AndroidDynamicDependerModuleContext) []string {
c.module.ModifyProperties(ctx)
depNames := CCDeps{} depNames := CCDeps{}
depNames = c.module.DepNames(ctx, depNames) depNames = c.module.DepNames(ctx, depNames)
staticLibs := depNames.WholeStaticLibs staticLibs := depNames.WholeStaticLibs
@@ -382,28 +388,28 @@ func (c *ccBase) AndroidDynamicDependencies(ctx common.AndroidDynamicDependerMod
// Create a ccFlags struct that collects the compile flags from global values, // Create a ccFlags struct that collects the compile flags from global values,
// per-target values, module type values, and per-module Blueprints properties // per-target values, module type values, and per-module Blueprints properties
func (c *ccBase) collectFlags(ctx common.AndroidModuleContext, toolchain Toolchain) CCFlags { func (c *CCBase) collectFlags(ctx common.AndroidModuleContext, toolchain Toolchain) CCFlags {
flags := CCFlags{ flags := CCFlags{
CFlags: c.properties.Cflags, CFlags: c.Properties.Cflags,
CppFlags: c.properties.Cppflags, CppFlags: c.Properties.Cppflags,
ConlyFlags: c.properties.Conlyflags, ConlyFlags: c.Properties.Conlyflags,
LdFlags: c.properties.Ldflags, LdFlags: c.Properties.Ldflags,
AsFlags: c.properties.Asflags, AsFlags: c.Properties.Asflags,
YaccFlags: c.properties.Yaccflags, YaccFlags: c.Properties.Yaccflags,
Nocrt: c.properties.Nocrt, Nocrt: c.Properties.Nocrt,
Toolchain: toolchain, Toolchain: toolchain,
Clang: c.properties.Clang, Clang: c.Properties.Clang,
} }
// Include dir cflags // Include dir cflags
rootIncludeDirs := pathtools.PrefixPaths(c.properties.Include_dirs, ctx.AConfig().SrcDir()) rootIncludeDirs := pathtools.PrefixPaths(c.Properties.Include_dirs, ctx.AConfig().SrcDir())
localIncludeDirs := pathtools.PrefixPaths(c.properties.Local_include_dirs, common.ModuleSrcDir(ctx)) localIncludeDirs := pathtools.PrefixPaths(c.Properties.Local_include_dirs, common.ModuleSrcDir(ctx))
flags.GlobalFlags = append(flags.GlobalFlags, flags.GlobalFlags = append(flags.GlobalFlags,
includeDirsToFlags(rootIncludeDirs), includeDirsToFlags(rootIncludeDirs),
includeDirsToFlags(localIncludeDirs)) includeDirsToFlags(localIncludeDirs))
if !c.properties.No_default_compiler_flags { if !c.Properties.No_default_compiler_flags {
if c.properties.Sdk_version == "" || ctx.Host() { if c.Properties.Sdk_version == "" || ctx.Host() {
flags.GlobalFlags = append(flags.GlobalFlags, flags.GlobalFlags = append(flags.GlobalFlags,
"${commonGlobalIncludes}", "${commonGlobalIncludes}",
toolchain.IncludeFlags(), toolchain.IncludeFlags(),
@@ -417,14 +423,14 @@ func (c *ccBase) collectFlags(ctx common.AndroidModuleContext, toolchain Toolcha
}...) }...)
} }
instructionSet := c.properties.Instruction_set instructionSet := c.Properties.Instruction_set
instructionSetFlags, err := toolchain.InstructionSetFlags(instructionSet) instructionSetFlags, err := toolchain.InstructionSetFlags(instructionSet)
if err != nil { if err != nil {
ctx.ModuleErrorf("%s", err) ctx.ModuleErrorf("%s", err)
} }
// TODO: debug // TODO: debug
flags.CFlags = append(flags.CFlags, c.properties.Release.Cflags...) flags.CFlags = append(flags.CFlags, c.Properties.Release.Cflags...)
if ctx.Host() && !ctx.ContainsProperty("clang") { if ctx.Host() && !ctx.ContainsProperty("clang") {
flags.Clang = true flags.Clang = true
@@ -432,8 +438,8 @@ func (c *ccBase) collectFlags(ctx common.AndroidModuleContext, toolchain Toolcha
if flags.Clang { if flags.Clang {
flags.CFlags = clangFilterUnknownCflags(flags.CFlags) flags.CFlags = clangFilterUnknownCflags(flags.CFlags)
flags.CFlags = append(flags.CFlags, c.properties.Clang_cflags...) flags.CFlags = append(flags.CFlags, c.Properties.Clang_cflags...)
flags.AsFlags = append(flags.AsFlags, c.properties.Clang_asflags...) flags.AsFlags = append(flags.AsFlags, c.Properties.Clang_asflags...)
flags.CppFlags = clangFilterUnknownCflags(flags.CppFlags) flags.CppFlags = clangFilterUnknownCflags(flags.CppFlags)
flags.ConlyFlags = clangFilterUnknownCflags(flags.ConlyFlags) flags.ConlyFlags = clangFilterUnknownCflags(flags.ConlyFlags)
flags.LdFlags = clangFilterUnknownCflags(flags.LdFlags) flags.LdFlags = clangFilterUnknownCflags(flags.LdFlags)
@@ -462,8 +468,8 @@ func (c *ccBase) collectFlags(ctx common.AndroidModuleContext, toolchain Toolcha
} }
} }
if !c.properties.No_default_compiler_flags { if !c.Properties.No_default_compiler_flags {
if ctx.Device() && !c.properties.Allow_undefined_symbols { if ctx.Device() && !c.Properties.Allow_undefined_symbols {
flags.LdFlags = append(flags.LdFlags, "-Wl,--no-undefined") flags.LdFlags = append(flags.LdFlags, "-Wl,--no-undefined")
} }
@@ -484,7 +490,7 @@ func (c *ccBase) collectFlags(ctx common.AndroidModuleContext, toolchain Toolcha
} }
if ctx.Device() { if ctx.Device() {
if c.properties.Rtti { if c.Properties.Rtti {
flags.CppFlags = append(flags.CppFlags, "-frtti") flags.CppFlags = append(flags.CppFlags, "-frtti")
} else { } else {
flags.CppFlags = append(flags.CppFlags, "-fno-rtti") flags.CppFlags = append(flags.CppFlags, "-fno-rtti")
@@ -502,7 +508,7 @@ func (c *ccBase) collectFlags(ctx common.AndroidModuleContext, toolchain Toolcha
} }
if ctx.Host() { if ctx.Host() {
flags.LdFlags = append(flags.LdFlags, c.properties.Host_ldlibs...) flags.LdFlags = append(flags.LdFlags, c.Properties.Host_ldlibs...)
} }
} }
@@ -520,12 +526,12 @@ func (c *ccBase) collectFlags(ctx common.AndroidModuleContext, toolchain Toolcha
return flags return flags
} }
func (c *ccBase) Flags(ctx common.AndroidModuleContext, flags CCFlags) CCFlags { func (c *CCBase) Flags(ctx common.AndroidModuleContext, flags CCFlags) CCFlags {
return flags return flags
} }
// Compile a list of source files into objects a specified subdirectory // Compile a list of source files into objects a specified subdirectory
func (c *ccBase) customCompileObjs(ctx common.AndroidModuleContext, flags CCFlags, func (c *CCBase) customCompileObjs(ctx common.AndroidModuleContext, flags CCFlags,
subdir string, srcFiles []string) []string { subdir string, srcFiles []string) []string {
buildFlags := ccFlagsToBuilderFlags(flags) buildFlags := ccFlagsToBuilderFlags(flags)
@@ -536,21 +542,21 @@ func (c *ccBase) customCompileObjs(ctx common.AndroidModuleContext, flags CCFlag
return TransformSourceToObj(ctx, subdir, srcFiles, buildFlags, deps) return TransformSourceToObj(ctx, subdir, srcFiles, buildFlags, deps)
} }
// Compile files listed in c.properties.Srcs into objects // Compile files listed in c.Properties.Srcs into objects
func (c *ccBase) compileObjs(ctx common.AndroidModuleContext, flags CCFlags) []string { func (c *CCBase) compileObjs(ctx common.AndroidModuleContext, flags CCFlags) []string {
if c.properties.SkipCompileObjs { if c.Properties.SkipCompileObjs {
return nil return nil
} }
return c.customCompileObjs(ctx, flags, "", c.properties.Srcs) return c.customCompileObjs(ctx, flags, "", c.Properties.Srcs)
} }
// Compile generated source files from dependencies // Compile generated source files from dependencies
func (c *ccBase) compileGeneratedObjs(ctx common.AndroidModuleContext, flags CCFlags) []string { func (c *CCBase) compileGeneratedObjs(ctx common.AndroidModuleContext, flags CCFlags) []string {
var srcs []string var srcs []string
if c.properties.SkipCompileObjs { if c.Properties.SkipCompileObjs {
return nil return nil
} }
@@ -567,11 +573,11 @@ func (c *ccBase) compileGeneratedObjs(ctx common.AndroidModuleContext, flags CCF
return TransformSourceToObj(ctx, "", srcs, ccFlagsToBuilderFlags(flags), nil) return TransformSourceToObj(ctx, "", srcs, ccFlagsToBuilderFlags(flags), nil)
} }
func (c *ccBase) outputFile() string { func (c *CCBase) outputFile() string {
return "" return ""
} }
func (c *ccBase) depsToPathsFromList(ctx common.AndroidModuleContext, func (c *CCBase) depsToPathsFromList(ctx common.AndroidModuleContext,
names []string) (modules []common.AndroidModule, names []string) (modules []common.AndroidModule,
outputFiles []string, exportedFlags []string) { outputFiles []string, exportedFlags []string) {
@@ -627,7 +633,7 @@ func (c *ccBase) depsToPathsFromList(ctx common.AndroidModuleContext,
// Convert depenedency names to paths. Takes a CCDeps containing names and returns a CCDeps // Convert depenedency names to paths. Takes a CCDeps containing names and returns a CCDeps
// containing paths // containing paths
func (c *ccBase) depsToPaths(ctx common.AndroidModuleContext, depNames CCDeps) CCDeps { func (c *CCBase) depsToPaths(ctx common.AndroidModuleContext, depNames CCDeps) CCDeps {
var depPaths CCDeps var depPaths CCDeps
var newCflags []string var newCflags []string
@@ -659,11 +665,11 @@ func (c *ccBase) depsToPaths(ctx common.AndroidModuleContext, depNames CCDeps) C
if obj, ok := m.(*ccObject); ok { if obj, ok := m.(*ccObject); ok {
otherName := ctx.OtherModuleName(m) otherName := ctx.OtherModuleName(m)
if otherName == depNames.CrtBegin { if otherName == depNames.CrtBegin {
if !c.properties.Nocrt { if !c.Properties.Nocrt {
depPaths.CrtBegin = obj.outputFile() depPaths.CrtBegin = obj.outputFile()
} }
} else if otherName == depNames.CrtEnd { } else if otherName == depNames.CrtEnd {
if !c.properties.Nocrt { if !c.Properties.Nocrt {
depPaths.CrtEnd = obj.outputFile() depPaths.CrtEnd = obj.outputFile()
} }
} else { } else {
@@ -675,9 +681,9 @@ func (c *ccBase) depsToPaths(ctx common.AndroidModuleContext, depNames CCDeps) C
return depPaths return depPaths
} }
// ccLinked contains the properties and members used by libraries and executables // CCLinked contains the properties and members used by libraries and executables
type ccLinked struct { type CCLinked struct {
ccBase CCBase
dynamicProperties struct { dynamicProperties struct {
VariantIsShared bool `blueprint:"mutated"` VariantIsShared bool `blueprint:"mutated"`
@@ -685,44 +691,44 @@ type ccLinked struct {
} }
} }
func newCCDynamic(dynamic *ccLinked, module CCModuleType, hod common.HostOrDeviceSupported, func newCCDynamic(dynamic *CCLinked, module CCModuleType, hod common.HostOrDeviceSupported,
multilib common.Multilib, props ...interface{}) (blueprint.Module, []interface{}) { multilib common.Multilib, props ...interface{}) (blueprint.Module, []interface{}) {
props = append(props, &dynamic.dynamicProperties) props = append(props, &dynamic.dynamicProperties)
return newCCBase(&dynamic.ccBase, module, hod, multilib, props...) return newCCBase(&dynamic.CCBase, module, hod, multilib, props...)
} }
func (c *ccLinked) systemSharedLibs(ctx common.AndroidBaseContext) []string { func (c *CCLinked) systemSharedLibs(ctx common.AndroidBaseContext) []string {
if ctx.ContainsProperty("system_shared_libs") { if ctx.ContainsProperty("system_shared_libs") {
return c.properties.System_shared_libs return c.Properties.System_shared_libs
} else if ctx.Device() && c.properties.Sdk_version == "" { } else if ctx.Device() && c.Properties.Sdk_version == "" {
return []string{"libc", "libm"} return []string{"libc", "libm"}
} else { } else {
return nil return nil
} }
} }
func (c *ccLinked) stl(ctx common.AndroidBaseContext) string { func (c *CCLinked) stl(ctx common.AndroidBaseContext) string {
if c.properties.Sdk_version != "" && ctx.Device() { if c.Properties.Sdk_version != "" && ctx.Device() {
switch c.properties.Stl { switch c.Properties.Stl {
case "": case "":
return "ndk_system" return "ndk_system"
case "c++_shared", "c++_static", case "c++_shared", "c++_static",
"stlport_shared", "stlport_static", "stlport_shared", "stlport_static",
"gnustl_static": "gnustl_static":
return "ndk_lib" + c.properties.Stl return "ndk_lib" + c.Properties.Stl
default: default:
ctx.ModuleErrorf("stl: %q is not a supported STL with sdk_version set", c.properties.Stl) ctx.ModuleErrorf("stl: %q is not a supported STL with sdk_version set", c.Properties.Stl)
return "" return ""
} }
} }
switch c.properties.Stl { switch c.Properties.Stl {
case "libc++", "libc++_static", case "libc++", "libc++_static",
"stlport", "stlport_static", "stlport", "stlport_static",
"libstdc++": "libstdc++":
return c.properties.Stl return c.Properties.Stl
case "none": case "none":
return "" return ""
case "": case "":
@@ -732,12 +738,12 @@ func (c *ccLinked) stl(ctx common.AndroidBaseContext) string {
return "libc++_static" return "libc++_static"
} }
default: default:
ctx.ModuleErrorf("stl: %q is not a supported STL", c.properties.Stl) ctx.ModuleErrorf("stl: %q is not a supported STL", c.Properties.Stl)
return "" return ""
} }
} }
func (c *ccLinked) Flags(ctx common.AndroidModuleContext, flags CCFlags) CCFlags { func (c *CCLinked) Flags(ctx common.AndroidModuleContext, flags CCFlags) CCFlags {
stl := c.stl(ctx) stl := c.stl(ctx)
if ctx.Failed() { if ctx.Failed() {
return flags return flags
@@ -782,14 +788,14 @@ func (c *ccLinked) Flags(ctx common.AndroidModuleContext, flags CCFlags) CCFlags
flags.LdFlags = append(flags.LdFlags, "-lc", "-lm") flags.LdFlags = append(flags.LdFlags, "-lc", "-lm")
} }
default: default:
panic(fmt.Errorf("Unknown stl in ccLinked.Flags: %q", stl)) panic(fmt.Errorf("Unknown stl in CCLinked.Flags: %q", stl))
} }
return flags return flags
} }
func (c *ccLinked) DepNames(ctx common.AndroidBaseContext, depNames CCDeps) CCDeps { func (c *CCLinked) DepNames(ctx common.AndroidBaseContext, depNames CCDeps) CCDeps {
depNames = c.ccBase.DepNames(ctx, depNames) depNames = c.CCBase.DepNames(ctx, depNames)
stl := c.stl(ctx) stl := c.stl(ctx)
if ctx.Failed() { if ctx.Failed() {
@@ -814,14 +820,14 @@ func (c *ccLinked) DepNames(ctx common.AndroidBaseContext, depNames CCDeps) CCDe
case "ndk_system": case "ndk_system":
// TODO: Make a system STL prebuilt for the NDK. // TODO: Make a system STL prebuilt for the NDK.
// The system STL doesn't have a prebuilt (it uses the system's libstdc++), but it does have // The system STL doesn't have a prebuilt (it uses the system's libstdc++), but it does have
// its own includes. The includes are handled in ccBase.Flags(). // its own includes. The includes are handled in CCBase.Flags().
depNames.SharedLibs = append([]string{"libstdc++"}, depNames.SharedLibs...) depNames.SharedLibs = append([]string{"libstdc++"}, depNames.SharedLibs...)
case "ndk_libc++_shared", "ndk_libstlport_shared": case "ndk_libc++_shared", "ndk_libstlport_shared":
depNames.SharedLibs = append(depNames.SharedLibs, stl) depNames.SharedLibs = append(depNames.SharedLibs, stl)
case "ndk_libc++_static", "ndk_libstlport_static", "ndk_libgnustl_static": case "ndk_libc++_static", "ndk_libstlport_static", "ndk_libgnustl_static":
depNames.StaticLibs = append(depNames.StaticLibs, stl) depNames.StaticLibs = append(depNames.StaticLibs, stl)
default: default:
panic(fmt.Errorf("Unknown stl in ccLinked.DepNames: %q", stl)) panic(fmt.Errorf("Unknown stl in CCLinked.DepNames: %q", stl))
} }
if ctx.Device() { if ctx.Device() {
@@ -835,8 +841,8 @@ func (c *ccLinked) DepNames(ctx common.AndroidBaseContext, depNames CCDeps) CCDe
depNames.SharedLibs = append(depNames.SharedLibs, c.systemSharedLibs(ctx)...) depNames.SharedLibs = append(depNames.SharedLibs, c.systemSharedLibs(ctx)...)
} }
if c.properties.Sdk_version != "" { if c.Properties.Sdk_version != "" {
version := c.properties.Sdk_version version := c.Properties.Sdk_version
depNames.SharedLibs = append(depNames.SharedLibs, depNames.SharedLibs = append(depNames.SharedLibs,
"ndk_libc."+version, "ndk_libc."+version,
"ndk_libm."+version, "ndk_libm."+version,
@@ -865,19 +871,19 @@ type ccLinkedInterface interface {
var _ ccLinkedInterface = (*CCLibrary)(nil) var _ ccLinkedInterface = (*CCLibrary)(nil)
var _ ccLinkedInterface = (*CCBinary)(nil) var _ ccLinkedInterface = (*CCBinary)(nil)
func (c *ccLinked) static() bool { func (c *CCLinked) static() bool {
return c.dynamicProperties.VariantIsStatic return c.dynamicProperties.VariantIsStatic
} }
func (c *ccLinked) shared() bool { func (c *CCLinked) shared() bool {
return c.dynamicProperties.VariantIsShared return c.dynamicProperties.VariantIsShared
} }
func (c *ccLinked) setStatic() { func (c *CCLinked) setStatic() {
c.dynamicProperties.VariantIsStatic = true c.dynamicProperties.VariantIsStatic = true
} }
func (c *ccLinked) setShared() { func (c *CCLinked) setShared() {
c.dynamicProperties.VariantIsShared = true c.dynamicProperties.VariantIsShared = true
} }
@@ -890,7 +896,7 @@ type ccExportedFlagsProducer interface {
// //
type CCLibrary struct { type CCLibrary struct {
ccLinked CCLinked
reuseFrom ccLibraryInterface reuseFrom ccLibraryInterface
reuseObjFiles []string reuseObjFiles []string
@@ -938,7 +944,7 @@ func (c *CCLibrary) ccLibrary() *CCLibrary {
func NewCCLibrary(library *CCLibrary, module CCModuleType, func NewCCLibrary(library *CCLibrary, module CCModuleType,
hod common.HostOrDeviceSupported) (blueprint.Module, []interface{}) { hod common.HostOrDeviceSupported) (blueprint.Module, []interface{}) {
return newCCDynamic(&library.ccLinked, module, hod, common.MultilibBoth, return newCCDynamic(&library.CCLinked, module, hod, common.MultilibBoth,
&library.LibraryProperties) &library.LibraryProperties)
} }
@@ -952,7 +958,7 @@ func CCLibraryFactory() (blueprint.Module, []interface{}) {
} }
func (c *CCLibrary) DepNames(ctx common.AndroidBaseContext, depNames CCDeps) CCDeps { func (c *CCLibrary) DepNames(ctx common.AndroidBaseContext, depNames CCDeps) CCDeps {
depNames = c.ccLinked.DepNames(ctx, depNames) depNames = c.CCLinked.DepNames(ctx, depNames)
if c.shared() { if c.shared() {
if ctx.Device() { if ctx.Device() {
depNames.CrtBegin = "crtbegin_so" depNames.CrtBegin = "crtbegin_so"
@@ -988,7 +994,7 @@ func (c *CCLibrary) exportedFlags() []string {
} }
func (c *CCLibrary) Flags(ctx common.AndroidModuleContext, flags CCFlags) CCFlags { func (c *CCLibrary) Flags(ctx common.AndroidModuleContext, flags CCFlags) CCFlags {
flags = c.ccLinked.Flags(ctx, flags) flags = c.CCLinked.Flags(ctx, flags)
flags.CFlags = append(flags.CFlags, "-fPIC") flags.CFlags = append(flags.CFlags, "-fPIC")
@@ -996,7 +1002,7 @@ func (c *CCLibrary) Flags(ctx common.AndroidModuleContext, flags CCFlags) CCFlag
libName := ctx.ModuleName() libName := ctx.ModuleName()
// GCC for Android assumes that -shared means -Bsymbolic, use -Wl,-shared instead // GCC for Android assumes that -shared means -Bsymbolic, use -Wl,-shared instead
sharedFlag := "-Wl,-shared" sharedFlag := "-Wl,-shared"
if c.properties.Clang || ctx.Host() { if c.Properties.Clang || ctx.Host() {
sharedFlag = "-shared" sharedFlag = "-shared"
} }
if ctx.Device() { if ctx.Device() {
@@ -1030,7 +1036,7 @@ func (c *CCLibrary) compileStaticLibrary(ctx common.AndroidModuleContext,
c.objFiles = objFiles c.objFiles = objFiles
c.out = outputFile c.out = outputFile
includeDirs := pathtools.PrefixPaths(c.properties.Export_include_dirs, common.ModuleSrcDir(ctx)) includeDirs := pathtools.PrefixPaths(c.Properties.Export_include_dirs, common.ModuleSrcDir(ctx))
c.exportFlags = []string{includeDirsToFlags(includeDirs)} c.exportFlags = []string{includeDirsToFlags(includeDirs)}
ctx.CheckbuildFile(outputFile) ctx.CheckbuildFile(outputFile)
@@ -1053,7 +1059,7 @@ func (c *CCLibrary) compileSharedLibrary(ctx common.AndroidModuleContext,
ccFlagsToBuilderFlags(flags), outputFile) ccFlagsToBuilderFlags(flags), outputFile)
c.out = outputFile c.out = outputFile
includeDirs := pathtools.PrefixPaths(c.properties.Export_include_dirs, common.ModuleSrcDir(ctx)) includeDirs := pathtools.PrefixPaths(c.Properties.Export_include_dirs, common.ModuleSrcDir(ctx))
c.exportFlags = []string{includeDirsToFlags(includeDirs)} c.exportFlags = []string{includeDirsToFlags(includeDirs)}
} }
@@ -1084,7 +1090,7 @@ func (c *CCLibrary) installSharedLibrary(ctx common.AndroidModuleContext, flags
installDir = "lib64" installDir = "lib64"
} }
ctx.InstallFile(filepath.Join(installDir, c.properties.Relative_install_path), c.out) ctx.InstallFile(filepath.Join(installDir, c.Properties.Relative_install_path), c.out)
} }
func (c *CCLibrary) installModule(ctx common.AndroidModuleContext, flags CCFlags) { func (c *CCLibrary) installModule(ctx common.AndroidModuleContext, flags CCFlags) {
@@ -1100,14 +1106,14 @@ func (c *CCLibrary) installModule(ctx common.AndroidModuleContext, flags CCFlags
// //
type ccObject struct { type ccObject struct {
ccBase CCBase
out string out string
} }
func CCObjectFactory() (blueprint.Module, []interface{}) { func CCObjectFactory() (blueprint.Module, []interface{}) {
module := &ccObject{} module := &ccObject{}
return newCCBase(&module.ccBase, module, common.DeviceSupported, common.MultilibBoth) return newCCBase(&module.CCBase, module, common.DeviceSupported, common.MultilibBoth)
} }
func (*ccObject) AndroidDynamicDependencies(ctx common.AndroidDynamicDependerModuleContext) []string { func (*ccObject) AndroidDynamicDependencies(ctx common.AndroidDynamicDependerModuleContext) []string {
@@ -1151,7 +1157,7 @@ func (c *ccObject) outputFile() string {
// //
type CCBinary struct { type CCBinary struct {
ccLinked CCLinked
out string out string
BinaryProperties struct { BinaryProperties struct {
// static_executable: compile executable with -static // static_executable: compile executable with -static
@@ -1186,7 +1192,7 @@ func (c *CCBinary) getStem(ctx common.AndroidModuleContext) string {
} }
func (c *CCBinary) DepNames(ctx common.AndroidBaseContext, depNames CCDeps) CCDeps { func (c *CCBinary) DepNames(ctx common.AndroidBaseContext, depNames CCDeps) CCDeps {
depNames = c.ccLinked.DepNames(ctx, depNames) depNames = c.CCLinked.DepNames(ctx, depNames)
if ctx.Device() { if ctx.Device() {
if c.BinaryProperties.Static_executable { if c.BinaryProperties.Static_executable {
depNames.CrtBegin = "crtbegin_static" depNames.CrtBegin = "crtbegin_static"
@@ -1213,7 +1219,7 @@ func NewCCBinary(binary *CCBinary, module CCModuleType,
props = append(props, &binary.BinaryProperties) props = append(props, &binary.BinaryProperties)
return newCCDynamic(&binary.ccLinked, module, hod, common.MultilibFirst, props...) return newCCDynamic(&binary.CCLinked, module, hod, common.MultilibFirst, props...)
} }
func CCBinaryFactory() (blueprint.Module, []interface{}) { func CCBinaryFactory() (blueprint.Module, []interface{}) {
@@ -1223,7 +1229,7 @@ func CCBinaryFactory() (blueprint.Module, []interface{}) {
} }
func (c *CCBinary) Flags(ctx common.AndroidModuleContext, flags CCFlags) CCFlags { func (c *CCBinary) Flags(ctx common.AndroidModuleContext, flags CCFlags) CCFlags {
flags = c.ccLinked.Flags(ctx, flags) flags = c.CCLinked.Flags(ctx, flags)
flags.CFlags = append(flags.CFlags, "-fpie") flags.CFlags = append(flags.CFlags, "-fpie")
@@ -1265,7 +1271,7 @@ func (c *CCBinary) Flags(ctx common.AndroidModuleContext, flags CCFlags) CCFlags
func (c *CCBinary) compileModule(ctx common.AndroidModuleContext, func (c *CCBinary) compileModule(ctx common.AndroidModuleContext,
flags CCFlags, deps CCDeps, objFiles []string) { flags CCFlags, deps CCDeps, objFiles []string) {
if !c.BinaryProperties.Static_executable && inList("libc", c.properties.Static_libs) { if !c.BinaryProperties.Static_executable && inList("libc", c.Properties.Static_libs) {
ctx.ModuleErrorf("statically linking libc to dynamic executable, please remove libc\n" + ctx.ModuleErrorf("statically linking libc to dynamic executable, please remove libc\n" +
"from static libs or set static_executable: true") "from static libs or set static_executable: true")
} }
@@ -1285,7 +1291,7 @@ func (c *CCBinary) compileModule(ctx common.AndroidModuleContext,
} }
func (c *CCBinary) installModule(ctx common.AndroidModuleContext, flags CCFlags) { func (c *CCBinary) installModule(ctx common.AndroidModuleContext, flags CCFlags) {
ctx.InstallFile(filepath.Join("bin", c.properties.Relative_install_path), c.out) ctx.InstallFile(filepath.Join("bin", c.Properties.Relative_install_path), c.out)
} }
type ccTest struct { type ccTest struct {
@@ -1337,13 +1343,13 @@ func CCTestFactory() (blueprint.Module, []interface{}) {
func TestPerSrcMutator(mctx blueprint.EarlyMutatorContext) { func TestPerSrcMutator(mctx blueprint.EarlyMutatorContext) {
if test, ok := mctx.Module().(*ccTest); ok { if test, ok := mctx.Module().(*ccTest); ok {
if test.testProperties.Test_per_src { if test.testProperties.Test_per_src {
testNames := make([]string, len(test.properties.Srcs)) testNames := make([]string, len(test.Properties.Srcs))
for i, src := range test.properties.Srcs { for i, src := range test.Properties.Srcs {
testNames[i] = strings.TrimSuffix(src, filepath.Ext(src)) testNames[i] = strings.TrimSuffix(src, filepath.Ext(src))
} }
tests := mctx.CreateLocalVariations(testNames...) tests := mctx.CreateLocalVariations(testNames...)
for i, src := range test.properties.Srcs { for i, src := range test.Properties.Srcs {
tests[i].(*ccTest).properties.Srcs = []string{src} tests[i].(*ccTest).Properties.Srcs = []string{src}
tests[i].(*ccTest).BinaryProperties.Stem = testNames[i] tests[i].(*ccTest).BinaryProperties.Stem = testNames[i]
} }
} }
@@ -1437,7 +1443,7 @@ func ToolchainLibraryFactory() (blueprint.Module, []interface{}) {
module.LibraryProperties.BuildStatic = true module.LibraryProperties.BuildStatic = true
return newCCBase(&module.ccBase, module, common.DeviceSupported, common.MultilibBoth, return newCCBase(&module.CCBase, module, common.DeviceSupported, common.MultilibBoth,
&module.LibraryProperties) &module.LibraryProperties)
} }
@@ -1498,13 +1504,13 @@ func (c *ndkPrebuiltLibrary) compileModule(ctx common.AndroidModuleContext, flag
ctx.ModuleErrorf("NDK prebuilts must have an ndk_lib prefixed name") ctx.ModuleErrorf("NDK prebuilts must have an ndk_lib prefixed name")
} }
includeDirs := pathtools.PrefixPaths(c.properties.Export_include_dirs, common.ModuleSrcDir(ctx)) includeDirs := pathtools.PrefixPaths(c.Properties.Export_include_dirs, common.ModuleSrcDir(ctx))
c.exportFlags = []string{common.JoinWithPrefix(includeDirs, "-isystem ")} c.exportFlags = []string{common.JoinWithPrefix(includeDirs, "-isystem ")}
// NDK prebuilt libraries are named like: ndk_LIBNAME.SDK_VERSION. // NDK prebuilt libraries are named like: ndk_LIBNAME.SDK_VERSION.
// We want to translate to just LIBNAME. // We want to translate to just LIBNAME.
libName := strings.Split(strings.TrimPrefix(ctx.ModuleName(), "ndk_"), ".")[0] libName := strings.Split(strings.TrimPrefix(ctx.ModuleName(), "ndk_"), ".")[0]
libDir := getNdkLibDir(ctx, flags.Toolchain, c.properties.Sdk_version) libDir := getNdkLibDir(ctx, flags.Toolchain, c.Properties.Sdk_version)
c.out = filepath.Join(libDir, libName+sharedLibraryExtension) c.out = filepath.Join(libDir, libName+sharedLibraryExtension)
} }
@@ -1568,7 +1574,7 @@ func (c *ndkPrebuiltStl) compileModule(ctx common.AndroidModuleContext, flags CC
ctx.ModuleErrorf("NDK prebuilts must have an ndk_lib prefixed name") ctx.ModuleErrorf("NDK prebuilts must have an ndk_lib prefixed name")
} }
includeDirs := pathtools.PrefixPaths(c.properties.Export_include_dirs, common.ModuleSrcDir(ctx)) includeDirs := pathtools.PrefixPaths(c.Properties.Export_include_dirs, common.ModuleSrcDir(ctx))
c.exportFlags = []string{includeDirsToFlags(includeDirs)} c.exportFlags = []string{includeDirsToFlags(includeDirs)}
libName := strings.TrimPrefix(ctx.ModuleName(), "ndk_") libName := strings.TrimPrefix(ctx.ModuleName(), "ndk_")