2019-10-11 07:59:13 +02:00
|
|
|
// Copyright (C) 2019 The Android Open Source Project
|
|
|
|
//
|
|
|
|
// 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 sdk
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
2019-11-27 18:43:54 +01:00
|
|
|
"reflect"
|
2020-03-02 11:16:35 +01:00
|
|
|
"sort"
|
2019-10-11 07:59:13 +02:00
|
|
|
"strings"
|
|
|
|
|
2020-03-06 13:30:13 +01:00
|
|
|
"android/soong/apex"
|
2020-03-12 11:24:35 +01:00
|
|
|
"android/soong/cc"
|
2020-06-11 20:32:11 +02:00
|
|
|
|
2019-11-29 21:17:53 +01:00
|
|
|
"github.com/google/blueprint"
|
2019-10-11 07:59:13 +02:00
|
|
|
"github.com/google/blueprint/proptools"
|
|
|
|
|
|
|
|
"android/soong/android"
|
|
|
|
)
|
|
|
|
|
|
|
|
var pctx = android.NewPackageContext("android/soong/sdk")
|
|
|
|
|
2019-11-29 21:17:53 +01:00
|
|
|
var (
|
|
|
|
repackageZip = pctx.AndroidStaticRule("SnapshotRepackageZip",
|
|
|
|
blueprint.RuleParams{
|
2019-12-09 20:58:17 +01:00
|
|
|
Command: `${config.Zip2ZipCmd} -i $in -o $out -x META-INF/**/* "**/*:$destdir"`,
|
2019-11-29 21:17:53 +01:00
|
|
|
CommandDeps: []string{
|
|
|
|
"${config.Zip2ZipCmd}",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
"destdir")
|
|
|
|
|
|
|
|
zipFiles = pctx.AndroidStaticRule("SnapshotZipFiles",
|
|
|
|
blueprint.RuleParams{
|
2020-08-19 22:51:47 +02:00
|
|
|
Command: `${config.SoongZipCmd} -C $basedir -r $out.rsp -o $out`,
|
2019-11-29 21:17:53 +01:00
|
|
|
CommandDeps: []string{
|
|
|
|
"${config.SoongZipCmd}",
|
|
|
|
},
|
|
|
|
Rspfile: "$out.rsp",
|
|
|
|
RspfileContent: "$in",
|
|
|
|
},
|
|
|
|
"basedir")
|
|
|
|
|
|
|
|
mergeZips = pctx.AndroidStaticRule("SnapshotMergeZips",
|
|
|
|
blueprint.RuleParams{
|
|
|
|
Command: `${config.MergeZipsCmd} $out $in`,
|
|
|
|
CommandDeps: []string{
|
|
|
|
"${config.MergeZipsCmd}",
|
|
|
|
},
|
|
|
|
})
|
|
|
|
)
|
|
|
|
|
2019-11-27 18:43:54 +01:00
|
|
|
type generatedContents struct {
|
|
|
|
content strings.Builder
|
|
|
|
indentLevel int
|
|
|
|
}
|
|
|
|
|
2019-10-11 07:59:13 +02:00
|
|
|
// generatedFile abstracts operations for writing contents into a file and emit a build rule
|
|
|
|
// for the file.
|
|
|
|
type generatedFile struct {
|
2019-11-27 18:43:54 +01:00
|
|
|
generatedContents
|
|
|
|
path android.OutputPath
|
2019-10-11 07:59:13 +02:00
|
|
|
}
|
|
|
|
|
2019-11-04 04:23:40 +01:00
|
|
|
func newGeneratedFile(ctx android.ModuleContext, path ...string) *generatedFile {
|
2019-10-11 07:59:13 +02:00
|
|
|
return &generatedFile{
|
2019-11-27 18:43:54 +01:00
|
|
|
path: android.PathForModuleOut(ctx, path...).OutputPath,
|
2019-10-11 07:59:13 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-27 18:43:54 +01:00
|
|
|
func (gc *generatedContents) Indent() {
|
|
|
|
gc.indentLevel++
|
2019-10-22 13:31:18 +02:00
|
|
|
}
|
|
|
|
|
2019-11-27 18:43:54 +01:00
|
|
|
func (gc *generatedContents) Dedent() {
|
|
|
|
gc.indentLevel--
|
2019-10-22 13:31:18 +02:00
|
|
|
}
|
|
|
|
|
2019-11-27 18:43:54 +01:00
|
|
|
func (gc *generatedContents) Printfln(format string, args ...interface{}) {
|
2020-05-11 23:59:25 +02:00
|
|
|
fmt.Fprintf(&(gc.content), strings.Repeat(" ", gc.indentLevel)+format+"\n", args...)
|
2019-10-11 07:59:13 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (gf *generatedFile) build(pctx android.PackageContext, ctx android.BuilderContext, implicits android.Paths) {
|
2020-11-17 02:32:30 +01:00
|
|
|
rb := android.NewRuleBuilder(pctx, ctx)
|
2020-05-11 23:59:25 +02:00
|
|
|
|
|
|
|
content := gf.content.String()
|
|
|
|
|
|
|
|
// ninja consumes newline characters in rspfile_content. Prevent it by
|
|
|
|
// escaping the backslash in the newline character. The extra backslash
|
|
|
|
// is removed when the rspfile is written to the actual script file
|
|
|
|
content = strings.ReplaceAll(content, "\n", "\\n")
|
|
|
|
|
2019-10-11 07:59:13 +02:00
|
|
|
rb.Command().
|
|
|
|
Implicits(implicits).
|
2021-04-20 16:54:21 +02:00
|
|
|
Text("echo -n").Text(proptools.ShellEscape(content)).
|
2020-05-11 23:59:25 +02:00
|
|
|
// convert \\n to \n
|
2019-10-11 07:59:13 +02:00
|
|
|
Text("| sed 's/\\\\n/\\n/g' >").Output(gf.path)
|
|
|
|
rb.Command().
|
|
|
|
Text("chmod a+x").Output(gf.path)
|
2020-11-17 02:32:30 +01:00
|
|
|
rb.Build(gf.path.Base(), "Build "+gf.path.Base())
|
2019-10-11 07:59:13 +02:00
|
|
|
}
|
|
|
|
|
2019-11-28 15:31:38 +01:00
|
|
|
// Collect all the members.
|
|
|
|
//
|
2021-04-24 02:10:30 +02:00
|
|
|
// Updates the sdk module with a list of sdkMemberVariantDeps and details as to which multilibs
|
|
|
|
// (32/64/both) are used by this sdk variant.
|
2020-03-20 18:50:07 +01:00
|
|
|
func (s *sdk) collectMembers(ctx android.ModuleContext) {
|
|
|
|
s.multilibUsages = multilibNone
|
2020-01-13 21:58:25 +01:00
|
|
|
ctx.WalkDeps(func(child android.Module, parent android.Module) bool {
|
|
|
|
tag := ctx.OtherModuleDependencyTag(child)
|
2019-11-19 20:44:10 +01:00
|
|
|
if memberTag, ok := tag.(android.SdkMemberTypeDependencyTag); ok {
|
2021-04-28 00:17:56 +02:00
|
|
|
memberType := memberTag.SdkMemberType(child)
|
2019-11-28 15:31:38 +01:00
|
|
|
|
|
|
|
// Make sure that the resolved module is allowed in the member list property.
|
2020-01-13 21:58:25 +01:00
|
|
|
if !memberType.IsInstance(child) {
|
|
|
|
ctx.ModuleErrorf("module %q is not valid in property %s", ctx.OtherModuleName(child), memberType.SdkPropertyName())
|
2019-11-28 15:31:38 +01:00
|
|
|
}
|
2019-10-22 13:31:18 +02:00
|
|
|
|
2020-03-20 18:50:07 +01:00
|
|
|
// Keep track of which multilib variants are used by the sdk.
|
|
|
|
s.multilibUsages = s.multilibUsages.addArchType(child.Target().Arch.ArchType)
|
|
|
|
|
2021-04-23 22:20:20 +02:00
|
|
|
export := memberTag.ExportMember()
|
2021-04-24 01:47:29 +02:00
|
|
|
s.memberVariantDeps = append(s.memberVariantDeps, sdkMemberVariantDep{s, memberType, child.(android.SdkAware), export})
|
2020-01-13 21:58:25 +01:00
|
|
|
|
2021-05-06 13:02:27 +02:00
|
|
|
// Recurse down into the member's dependencies as it may have dependencies that need to be
|
|
|
|
// automatically added to the sdk.
|
|
|
|
return true
|
2019-10-22 13:31:18 +02:00
|
|
|
}
|
2020-01-13 21:58:25 +01:00
|
|
|
|
|
|
|
return false
|
2019-10-22 13:31:18 +02:00
|
|
|
})
|
2020-02-25 20:26:33 +01:00
|
|
|
}
|
|
|
|
|
2021-04-24 02:10:30 +02:00
|
|
|
// groupMemberVariantsByMemberThenType groups the member variant dependencies so that all the
|
|
|
|
// variants of each member are grouped together within an sdkMember instance.
|
2020-02-25 20:26:33 +01:00
|
|
|
//
|
2021-04-24 02:10:30 +02:00
|
|
|
// The sdkMember instances are then grouped into slices by member type. Within each such slice the
|
|
|
|
// sdkMember instances appear in the order they were added as dependencies.
|
2020-02-25 20:26:33 +01:00
|
|
|
//
|
2021-04-24 02:10:30 +02:00
|
|
|
// Finally, the member type slices are concatenated together to form a single slice. The order in
|
|
|
|
// which they are concatenated is the order in which the member types were registered in the
|
|
|
|
// android.SdkMemberTypesRegistry.
|
|
|
|
func (s *sdk) groupMemberVariantsByMemberThenType(ctx android.ModuleContext, memberVariantDeps []sdkMemberVariantDep) []*sdkMember {
|
2020-02-25 20:26:33 +01:00
|
|
|
byType := make(map[android.SdkMemberType][]*sdkMember)
|
|
|
|
byName := make(map[string]*sdkMember)
|
|
|
|
|
2021-04-24 13:16:36 +02:00
|
|
|
for _, memberVariantDep := range memberVariantDeps {
|
|
|
|
memberType := memberVariantDep.memberType
|
|
|
|
variant := memberVariantDep.variant
|
2020-02-25 20:26:33 +01:00
|
|
|
|
|
|
|
name := ctx.OtherModuleName(variant)
|
|
|
|
member := byName[name]
|
|
|
|
if member == nil {
|
|
|
|
member = &sdkMember{memberType: memberType, name: name}
|
|
|
|
byName[name] = member
|
|
|
|
byType[memberType] = append(byType[memberType], member)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Only append new variants to the list. This is needed because a member can be both
|
|
|
|
// exported by the sdk and also be a transitive sdk member.
|
|
|
|
member.variants = appendUniqueVariants(member.variants, variant)
|
|
|
|
}
|
|
|
|
|
2019-11-28 15:31:38 +01:00
|
|
|
var members []*sdkMember
|
2020-01-20 19:16:30 +01:00
|
|
|
for _, memberListProperty := range s.memberListProperties() {
|
2019-11-28 15:31:38 +01:00
|
|
|
membersOfType := byType[memberListProperty.memberType]
|
|
|
|
members = append(members, membersOfType...)
|
2019-10-22 13:31:18 +02:00
|
|
|
}
|
|
|
|
|
2020-03-20 18:50:07 +01:00
|
|
|
return members
|
2019-10-22 13:31:18 +02:00
|
|
|
}
|
|
|
|
|
2020-01-20 19:16:30 +01:00
|
|
|
func appendUniqueVariants(variants []android.SdkAware, newVariant android.SdkAware) []android.SdkAware {
|
|
|
|
for _, v := range variants {
|
|
|
|
if v == newVariant {
|
|
|
|
return variants
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return append(variants, newVariant)
|
|
|
|
}
|
|
|
|
|
2019-10-22 13:31:18 +02:00
|
|
|
// SDK directory structure
|
|
|
|
// <sdk_root>/
|
|
|
|
// Android.bp : definition of a 'sdk' module is here. This is a hand-made one.
|
|
|
|
// <api_ver>/ : below this directory are all auto-generated
|
|
|
|
// Android.bp : definition of 'sdk_snapshot' module is here
|
|
|
|
// aidl/
|
|
|
|
// frameworks/base/core/..../IFoo.aidl : an exported AIDL file
|
|
|
|
// java/
|
2019-11-04 04:23:40 +01:00
|
|
|
// <module_name>.jar : the stub jar for a java library 'module_name'
|
2019-10-22 13:31:18 +02:00
|
|
|
// include/
|
|
|
|
// bionic/libc/include/stdlib.h : an exported header file
|
|
|
|
// include_gen/
|
2019-11-04 04:23:40 +01:00
|
|
|
// <module_name>/com/android/.../IFoo.h : a generated header file
|
2019-10-22 13:31:18 +02:00
|
|
|
// <arch>/include/ : arch-specific exported headers
|
|
|
|
// <arch>/include_gen/ : arch-specific generated headers
|
|
|
|
// <arch>/lib/
|
|
|
|
// libFoo.so : a stub library
|
|
|
|
|
2019-11-04 04:23:40 +01:00
|
|
|
// A name that uniquely identifies a prebuilt SDK member for a version of SDK snapshot
|
2019-10-22 13:31:18 +02:00
|
|
|
// This isn't visible to users, so could be changed in future.
|
|
|
|
func versionedSdkMemberName(ctx android.ModuleContext, memberName string, version string) string {
|
|
|
|
return ctx.ModuleName() + "_" + memberName + string(android.SdkVersionSeparator) + version
|
|
|
|
}
|
|
|
|
|
2019-11-12 20:39:25 +01:00
|
|
|
// buildSnapshot is the main function in this source file. It creates rules to copy
|
|
|
|
// the contents (header files, stub libraries, etc) into the zip file.
|
2020-02-25 20:26:33 +01:00
|
|
|
func (s *sdk) buildSnapshot(ctx android.ModuleContext, sdkVariants []*sdk) android.OutputPath {
|
|
|
|
|
2020-03-06 13:30:43 +01:00
|
|
|
allMembersByName := make(map[string]struct{})
|
|
|
|
exportedMembersByName := make(map[string]struct{})
|
2021-04-24 13:16:36 +02:00
|
|
|
var memberVariantDeps []sdkMemberVariantDep
|
2020-02-25 20:26:33 +01:00
|
|
|
for _, sdkVariant := range sdkVariants {
|
2021-04-24 13:16:36 +02:00
|
|
|
memberVariantDeps = append(memberVariantDeps, sdkVariant.memberVariantDeps...)
|
2020-03-02 19:38:15 +01:00
|
|
|
|
2020-03-06 13:30:43 +01:00
|
|
|
// Record the names of all the members, both explicitly specified and implicitly
|
|
|
|
// included.
|
2021-04-24 13:16:36 +02:00
|
|
|
for _, memberVariantDep := range sdkVariant.memberVariantDeps {
|
2021-04-23 22:20:20 +02:00
|
|
|
name := memberVariantDep.variant.Name()
|
|
|
|
allMembersByName[name] = struct{}{}
|
2020-03-06 13:30:43 +01:00
|
|
|
|
2021-04-23 22:20:20 +02:00
|
|
|
if memberVariantDep.export {
|
|
|
|
exportedMembersByName[name] = struct{}{}
|
|
|
|
}
|
2020-03-02 19:38:15 +01:00
|
|
|
}
|
2020-02-25 20:26:33 +01:00
|
|
|
}
|
|
|
|
|
2019-11-12 20:39:25 +01:00
|
|
|
snapshotDir := android.PathForModuleOut(ctx, "snapshot")
|
|
|
|
|
2019-11-04 04:23:40 +01:00
|
|
|
bp := newGeneratedFile(ctx, "snapshot", "Android.bp")
|
2019-11-27 18:43:54 +01:00
|
|
|
|
|
|
|
bpFile := &bpFile{
|
|
|
|
modules: make(map[string]*bpModule),
|
|
|
|
}
|
2019-11-12 20:39:25 +01:00
|
|
|
|
|
|
|
builder := &snapshotBuilder{
|
2020-03-06 13:30:43 +01:00
|
|
|
ctx: ctx,
|
|
|
|
sdk: s,
|
|
|
|
version: "current",
|
|
|
|
snapshotDir: snapshotDir.OutputPath,
|
|
|
|
copies: make(map[string]string),
|
|
|
|
filesToZip: []android.Path{bp.path},
|
|
|
|
bpFile: bpFile,
|
|
|
|
prebuiltModules: make(map[string]*bpModule),
|
|
|
|
allMembersByName: allMembersByName,
|
|
|
|
exportedMembersByName: exportedMembersByName,
|
2019-10-11 07:59:13 +02:00
|
|
|
}
|
2019-11-26 19:02:20 +01:00
|
|
|
s.builderForTests = builder
|
2019-10-11 07:59:13 +02:00
|
|
|
|
2021-04-24 02:10:30 +02:00
|
|
|
// Create the prebuilt modules for each of the member modules.
|
|
|
|
members := s.groupMemberVariantsByMemberThenType(ctx, memberVariantDeps)
|
2020-02-19 17:19:27 +01:00
|
|
|
for _, member := range members {
|
2020-02-27 17:00:53 +01:00
|
|
|
memberType := member.memberType
|
2020-03-19 17:11:18 +01:00
|
|
|
|
2020-03-17 22:04:24 +01:00
|
|
|
memberCtx := &memberContext{ctx, builder, memberType, member.name}
|
2020-03-19 17:11:18 +01:00
|
|
|
|
|
|
|
prebuiltModule := memberType.AddPrebuiltModule(memberCtx, member)
|
2020-07-11 05:52:24 +02:00
|
|
|
s.createMemberSnapshot(memberCtx, member, prebuiltModule.(*bpModule))
|
2019-10-22 13:31:18 +02:00
|
|
|
}
|
2019-10-11 07:59:13 +02:00
|
|
|
|
2020-01-15 15:08:51 +01:00
|
|
|
// Create a transformer that will transform an unversioned module into a versioned module.
|
|
|
|
unversionedToVersionedTransformer := unversionedToVersionedTransformation{builder: builder}
|
|
|
|
|
2020-01-20 19:16:30 +01:00
|
|
|
// Create a transformer that will transform an unversioned module by replacing any references
|
|
|
|
// to internal members with a unique module name and setting prefer: false.
|
|
|
|
unversionedTransformer := unversionedTransformation{builder: builder}
|
|
|
|
|
2019-11-27 18:43:54 +01:00
|
|
|
for _, unversioned := range builder.prebuiltOrder {
|
2020-02-21 17:29:35 +01:00
|
|
|
// Prune any empty property sets.
|
|
|
|
unversioned = unversioned.transform(pruneEmptySetTransformer{})
|
|
|
|
|
2019-11-27 18:43:54 +01:00
|
|
|
// Copy the unversioned module so it can be modified to make it versioned.
|
2020-01-14 16:53:11 +01:00
|
|
|
versioned := unversioned.deepCopy()
|
2020-01-15 15:08:51 +01:00
|
|
|
|
|
|
|
// Transform the unversioned module into a versioned one.
|
|
|
|
versioned.transform(unversionedToVersionedTransformer)
|
2019-11-27 18:43:54 +01:00
|
|
|
bpFile.AddModule(versioned)
|
|
|
|
|
2020-01-20 19:16:30 +01:00
|
|
|
// Transform the unversioned module to make it suitable for use in the snapshot.
|
|
|
|
unversioned.transform(unversionedTransformer)
|
2019-11-27 18:43:54 +01:00
|
|
|
bpFile.AddModule(unversioned)
|
|
|
|
}
|
2019-11-12 20:39:25 +01:00
|
|
|
|
2021-04-24 01:34:10 +02:00
|
|
|
// Add the sdk/module_exports_snapshot module to the bp file.
|
2021-04-24 13:16:36 +02:00
|
|
|
s.addSnapshotModule(ctx, builder, sdkVariants, memberVariantDeps)
|
2021-04-24 01:34:10 +02:00
|
|
|
|
|
|
|
// generate Android.bp
|
|
|
|
bp = newGeneratedFile(ctx, "snapshot", "Android.bp")
|
|
|
|
generateBpContents(&bp.generatedContents, bpFile)
|
|
|
|
|
|
|
|
contents := bp.content.String()
|
|
|
|
syntaxCheckSnapshotBpFile(ctx, contents)
|
|
|
|
|
|
|
|
bp.build(pctx, ctx, nil)
|
|
|
|
|
|
|
|
filesToZip := builder.filesToZip
|
|
|
|
|
|
|
|
// zip them all
|
|
|
|
outputZipFile := android.PathForModuleOut(ctx, ctx.ModuleName()+"-current.zip").OutputPath
|
|
|
|
outputDesc := "Building snapshot for " + ctx.ModuleName()
|
|
|
|
|
|
|
|
// If there are no zips to merge then generate the output zip directly.
|
|
|
|
// Otherwise, generate an intermediate zip file into which other zips can be
|
|
|
|
// merged.
|
|
|
|
var zipFile android.OutputPath
|
|
|
|
var desc string
|
|
|
|
if len(builder.zipsToMerge) == 0 {
|
|
|
|
zipFile = outputZipFile
|
|
|
|
desc = outputDesc
|
|
|
|
} else {
|
|
|
|
zipFile = android.PathForModuleOut(ctx, ctx.ModuleName()+"-current.unmerged.zip").OutputPath
|
|
|
|
desc = "Building intermediate snapshot for " + ctx.ModuleName()
|
|
|
|
}
|
|
|
|
|
|
|
|
ctx.Build(pctx, android.BuildParams{
|
|
|
|
Description: desc,
|
|
|
|
Rule: zipFiles,
|
|
|
|
Inputs: filesToZip,
|
|
|
|
Output: zipFile,
|
|
|
|
Args: map[string]string{
|
|
|
|
"basedir": builder.snapshotDir.String(),
|
|
|
|
},
|
|
|
|
})
|
|
|
|
|
|
|
|
if len(builder.zipsToMerge) != 0 {
|
|
|
|
ctx.Build(pctx, android.BuildParams{
|
|
|
|
Description: outputDesc,
|
|
|
|
Rule: mergeZips,
|
|
|
|
Input: zipFile,
|
|
|
|
Inputs: builder.zipsToMerge,
|
|
|
|
Output: outputZipFile,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
return outputZipFile
|
|
|
|
}
|
|
|
|
|
|
|
|
// addSnapshotModule adds the sdk_snapshot/module_exports_snapshot module to the builder.
|
2021-04-24 13:16:36 +02:00
|
|
|
func (s *sdk) addSnapshotModule(ctx android.ModuleContext, builder *snapshotBuilder, sdkVariants []*sdk, memberVariantDeps []sdkMemberVariantDep) {
|
2021-04-24 01:34:10 +02:00
|
|
|
bpFile := builder.bpFile
|
|
|
|
|
2019-11-27 18:43:54 +01:00
|
|
|
snapshotName := ctx.ModuleName() + string(android.SdkVersionSeparator) + builder.version
|
2019-12-16 18:21:27 +01:00
|
|
|
var snapshotModuleType string
|
|
|
|
if s.properties.Module_exports {
|
|
|
|
snapshotModuleType = "module_exports_snapshot"
|
|
|
|
} else {
|
|
|
|
snapshotModuleType = "sdk_snapshot"
|
|
|
|
}
|
|
|
|
snapshotModule := bpFile.newModule(snapshotModuleType)
|
2019-11-27 18:43:54 +01:00
|
|
|
snapshotModule.AddProperty("name", snapshotName)
|
2019-12-05 15:31:48 +01:00
|
|
|
|
|
|
|
// Make sure that the snapshot has the same visibility as the sdk.
|
2020-09-29 17:01:08 +02:00
|
|
|
visibility := android.EffectiveVisibilityRules(ctx, s).Strings()
|
2019-12-05 15:31:48 +01:00
|
|
|
if len(visibility) != 0 {
|
|
|
|
snapshotModule.AddProperty("visibility", visibility)
|
|
|
|
}
|
|
|
|
|
2020-03-02 19:38:15 +01:00
|
|
|
addHostDeviceSupportedProperties(s.ModuleBase.DeviceSupported(), s.ModuleBase.HostSupported(), snapshotModule)
|
2020-02-19 17:19:27 +01:00
|
|
|
|
2021-04-24 01:47:29 +02:00
|
|
|
combinedPropertiesList := s.collateSnapshotModuleInfo(ctx, sdkVariants, memberVariantDeps)
|
2021-04-24 12:32:59 +02:00
|
|
|
commonCombinedProperties := s.optimizeSnapshotModuleProperties(ctx, combinedPropertiesList)
|
2021-04-24 13:37:13 +02:00
|
|
|
|
2021-04-24 12:32:59 +02:00
|
|
|
s.addSnapshotPropertiesToPropertySet(builder, snapshotModule, commonCombinedProperties)
|
2020-07-10 20:55:36 +02:00
|
|
|
|
2020-03-20 18:50:07 +01:00
|
|
|
targetPropertySet := snapshotModule.AddPropertySet("target")
|
2020-07-11 05:52:24 +02:00
|
|
|
|
2021-04-24 12:32:59 +02:00
|
|
|
// Create a mapping from osType to combined properties.
|
|
|
|
osTypeToCombinedProperties := map[android.OsType]*combinedSnapshotModuleProperties{}
|
|
|
|
for _, combined := range combinedPropertiesList {
|
|
|
|
osTypeToCombinedProperties[combined.sdkVariant.Os()] = combined
|
|
|
|
}
|
|
|
|
|
2020-07-11 05:52:24 +02:00
|
|
|
// Iterate over the os types in a fixed order.
|
2020-03-02 19:38:15 +01:00
|
|
|
for _, osType := range s.getPossibleOsTypes() {
|
2021-04-24 12:32:59 +02:00
|
|
|
if combined, ok := osTypeToCombinedProperties[osType]; ok {
|
2021-04-24 02:10:30 +02:00
|
|
|
osPropertySet := targetPropertySet.AddPropertySet(osType.Name)
|
2020-03-20 18:50:07 +01:00
|
|
|
|
2021-04-24 12:32:59 +02:00
|
|
|
s.addSnapshotPropertiesToPropertySet(builder, osPropertySet, combined)
|
2019-11-28 15:31:38 +01:00
|
|
|
}
|
2019-10-22 13:31:18 +02:00
|
|
|
}
|
2020-03-02 19:38:15 +01:00
|
|
|
|
Enable sdk and sdk members in os_arch granularity
This amends Idad7ef138cdbcbd209d390bf6c10ca8365d4619f. With the change,
when there is a member that returns IsHostOsDependent() == true,
the sdk having the member and the member itself are disable for host and
only the os that the member supports is explicitly enabled.
However, that change will cause a problem when we add the support for
the linux_bionic_arm64 target. The target is not enabled when building
sdk snapshots. The only linux_bionic target that is enabled is
'linux_bionic_x86_64'. However, since the granularity is os which is
linux_bionic, the snapshot is generated as follows.
cc_prebuilt_binary {
target: {
host: {
enabled: false,
},
linux_bionic: {
enabled: true,
},
linux_bionic_x86_64: {
srcs: ["x86_64/bin/..."],
},
// no srcs for linux_bionic_arm64
},
}
Above is a problem for linux_bionic_arm64 target because the target is
enabled (via linux_bionic.enabled: true), but srcs is not provided.
To fix the problem, the enabling of a target is done in a target
(os_arch) granularity, rather than os granularity. For example, above
now becomes ...
cc_prebuilt_binary {
target: {
host: {
enabled: false,
},
linux_bionic_x86_64: {
enabled: true,
srcs: ["x86_64/bin/..."],
},
},
}
Only the targets that the snapshot actually can provide srcs are enabled
and the rest of the host targets are disabled.
Bug: 159685774
Test: m nothing
Test: build/soong/scripts/build-aml-prebuilts.sh
runtime-module-host-exports
Change-Id: Ibca48c40f6dc4628b5f4bfa4ceb68ebe0973cc81
2020-10-19 15:47:34 +02:00
|
|
|
// If host is supported and any member is host OS dependent then disable host
|
|
|
|
// by default, so that we can enable each host OS variant explicitly. This
|
|
|
|
// avoids problems with implicitly enabled OS variants when the snapshot is
|
|
|
|
// used, which might be different from this run (e.g. different build OS).
|
|
|
|
if s.HostSupported() {
|
|
|
|
var supportedHostTargets []string
|
2021-04-24 13:16:36 +02:00
|
|
|
for _, memberVariantDep := range memberVariantDeps {
|
|
|
|
if memberVariantDep.memberType.IsHostOsDependent() && memberVariantDep.variant.Target().Os.Class == android.Host {
|
|
|
|
targetString := memberVariantDep.variant.Target().Os.String() + "_" + memberVariantDep.variant.Target().Arch.ArchType.String()
|
Enable sdk and sdk members in os_arch granularity
This amends Idad7ef138cdbcbd209d390bf6c10ca8365d4619f. With the change,
when there is a member that returns IsHostOsDependent() == true,
the sdk having the member and the member itself are disable for host and
only the os that the member supports is explicitly enabled.
However, that change will cause a problem when we add the support for
the linux_bionic_arm64 target. The target is not enabled when building
sdk snapshots. The only linux_bionic target that is enabled is
'linux_bionic_x86_64'. However, since the granularity is os which is
linux_bionic, the snapshot is generated as follows.
cc_prebuilt_binary {
target: {
host: {
enabled: false,
},
linux_bionic: {
enabled: true,
},
linux_bionic_x86_64: {
srcs: ["x86_64/bin/..."],
},
// no srcs for linux_bionic_arm64
},
}
Above is a problem for linux_bionic_arm64 target because the target is
enabled (via linux_bionic.enabled: true), but srcs is not provided.
To fix the problem, the enabling of a target is done in a target
(os_arch) granularity, rather than os granularity. For example, above
now becomes ...
cc_prebuilt_binary {
target: {
host: {
enabled: false,
},
linux_bionic_x86_64: {
enabled: true,
srcs: ["x86_64/bin/..."],
},
},
}
Only the targets that the snapshot actually can provide srcs are enabled
and the rest of the host targets are disabled.
Bug: 159685774
Test: m nothing
Test: build/soong/scripts/build-aml-prebuilts.sh
runtime-module-host-exports
Change-Id: Ibca48c40f6dc4628b5f4bfa4ceb68ebe0973cc81
2020-10-19 15:47:34 +02:00
|
|
|
if !android.InList(targetString, supportedHostTargets) {
|
|
|
|
supportedHostTargets = append(supportedHostTargets, targetString)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if len(supportedHostTargets) > 0 {
|
|
|
|
hostPropertySet := targetPropertySet.AddPropertySet("host")
|
|
|
|
hostPropertySet.AddProperty("enabled", false)
|
|
|
|
}
|
|
|
|
// Enable the <os>_<arch> variant explicitly when we've disabled it by default on host.
|
|
|
|
for _, hostTarget := range supportedHostTargets {
|
|
|
|
propertySet := targetPropertySet.AddPropertySet(hostTarget)
|
|
|
|
propertySet.AddProperty("enabled", true)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-02 19:38:15 +01:00
|
|
|
// Prune any empty property sets.
|
|
|
|
snapshotModule.transform(pruneEmptySetTransformer{})
|
|
|
|
|
2019-11-27 18:43:54 +01:00
|
|
|
bpFile.AddModule(snapshotModule)
|
2019-11-12 20:39:25 +01:00
|
|
|
}
|
|
|
|
|
2020-05-07 21:21:34 +02:00
|
|
|
// Check the syntax of the generated Android.bp file contents and if they are
|
|
|
|
// invalid then log an error with the contents (tagged with line numbers) and the
|
|
|
|
// errors that were found so that it is easy to see where the problem lies.
|
|
|
|
func syntaxCheckSnapshotBpFile(ctx android.ModuleContext, contents string) {
|
|
|
|
errs := android.CheckBlueprintSyntax(ctx, "Android.bp", contents)
|
|
|
|
if len(errs) != 0 {
|
|
|
|
message := &strings.Builder{}
|
|
|
|
_, _ = fmt.Fprint(message, `errors in generated Android.bp snapshot:
|
|
|
|
|
|
|
|
Generated Android.bp contents
|
|
|
|
========================================================================
|
|
|
|
`)
|
|
|
|
for i, line := range strings.Split(contents, "\n") {
|
|
|
|
_, _ = fmt.Fprintf(message, "%6d: %s\n", i+1, line)
|
|
|
|
}
|
|
|
|
|
|
|
|
_, _ = fmt.Fprint(message, `
|
|
|
|
========================================================================
|
|
|
|
|
|
|
|
Errors found:
|
|
|
|
`)
|
|
|
|
|
|
|
|
for _, err := range errs {
|
|
|
|
_, _ = fmt.Fprintf(message, "%s\n", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
ctx.ModuleErrorf("%s", message.String())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-06 13:35:38 +02:00
|
|
|
func extractCommonProperties(ctx android.ModuleContext, extractor *commonValueExtractor, commonProperties interface{}, inputPropertiesSlice interface{}) {
|
|
|
|
err := extractor.extractCommonProperties(commonProperties, inputPropertiesSlice)
|
|
|
|
if err != nil {
|
|
|
|
ctx.ModuleErrorf("error extracting common properties: %s", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-04-24 13:37:13 +02:00
|
|
|
// snapshotModuleStaticProperties contains snapshot static (i.e. not dynamically generated) properties.
|
|
|
|
type snapshotModuleStaticProperties struct {
|
|
|
|
Compile_multilib string `android:"arch_variant"`
|
|
|
|
}
|
|
|
|
|
2021-04-24 12:32:59 +02:00
|
|
|
// combinedSnapshotModuleProperties are the properties that are associated with the snapshot module.
|
|
|
|
type combinedSnapshotModuleProperties struct {
|
|
|
|
// The sdk variant from which this information was collected.
|
|
|
|
sdkVariant *sdk
|
|
|
|
|
|
|
|
// Static snapshot module properties.
|
|
|
|
staticProperties *snapshotModuleStaticProperties
|
|
|
|
|
|
|
|
// The dynamically generated member list properties.
|
|
|
|
dynamicProperties interface{}
|
|
|
|
}
|
|
|
|
|
|
|
|
// collateSnapshotModuleInfo collates all the snapshot module info from supplied sdk variants.
|
2021-04-24 01:47:29 +02:00
|
|
|
func (s *sdk) collateSnapshotModuleInfo(ctx android.BaseModuleContext, sdkVariants []*sdk, memberVariantDeps []sdkMemberVariantDep) []*combinedSnapshotModuleProperties {
|
|
|
|
sdkVariantToCombinedProperties := map[*sdk]*combinedSnapshotModuleProperties{}
|
2021-04-24 12:32:59 +02:00
|
|
|
var list []*combinedSnapshotModuleProperties
|
|
|
|
for _, sdkVariant := range sdkVariants {
|
|
|
|
staticProperties := &snapshotModuleStaticProperties{
|
|
|
|
Compile_multilib: sdkVariant.multilibUsages.String(),
|
|
|
|
}
|
2021-04-24 01:47:29 +02:00
|
|
|
dynamicProperties := s.dynamicSdkMemberTypes.createMemberListProperties()
|
2021-04-24 12:32:59 +02:00
|
|
|
|
2021-04-24 01:47:29 +02:00
|
|
|
combinedProperties := &combinedSnapshotModuleProperties{
|
2021-04-24 12:32:59 +02:00
|
|
|
sdkVariant: sdkVariant,
|
|
|
|
staticProperties: staticProperties,
|
|
|
|
dynamicProperties: dynamicProperties,
|
2021-04-24 01:47:29 +02:00
|
|
|
}
|
|
|
|
sdkVariantToCombinedProperties[sdkVariant] = combinedProperties
|
|
|
|
|
|
|
|
list = append(list, combinedProperties)
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, memberVariantDep := range memberVariantDeps {
|
|
|
|
// If the member dependency is internal then do not add the dependency to the snapshot member
|
|
|
|
// list properties.
|
|
|
|
if !memberVariantDep.export {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
combined := sdkVariantToCombinedProperties[memberVariantDep.sdkVariant]
|
|
|
|
memberTypeProperty := s.memberListProperty(memberVariantDep.memberType)
|
|
|
|
memberName := ctx.OtherModuleName(memberVariantDep.variant)
|
|
|
|
|
|
|
|
// Append the member to the appropriate list, if it is not already present in the list.
|
|
|
|
memberList := memberTypeProperty.getter(combined.dynamicProperties)
|
|
|
|
if !android.InList(memberName, memberList) {
|
|
|
|
memberList = append(memberList, memberName)
|
|
|
|
}
|
|
|
|
memberTypeProperty.setter(combined.dynamicProperties, memberList)
|
2021-04-24 12:32:59 +02:00
|
|
|
}
|
2021-04-24 01:47:29 +02:00
|
|
|
|
2021-04-24 12:32:59 +02:00
|
|
|
return list
|
|
|
|
}
|
|
|
|
|
|
|
|
func (s *sdk) optimizeSnapshotModuleProperties(ctx android.ModuleContext, list []*combinedSnapshotModuleProperties) *combinedSnapshotModuleProperties {
|
|
|
|
|
|
|
|
// Extract the dynamic properties and add them to a list of propertiesContainer.
|
|
|
|
propertyContainers := []propertiesContainer{}
|
|
|
|
for _, i := range list {
|
|
|
|
propertyContainers = append(propertyContainers, sdkVariantPropertiesContainer{
|
|
|
|
sdkVariant: i.sdkVariant,
|
|
|
|
properties: i.dynamicProperties,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
// Extract the common members, removing them from the original properties.
|
|
|
|
commonDynamicProperties := s.dynamicSdkMemberTypes.createMemberListProperties()
|
|
|
|
extractor := newCommonValueExtractor(commonDynamicProperties)
|
|
|
|
extractCommonProperties(ctx, extractor, commonDynamicProperties, propertyContainers)
|
|
|
|
|
|
|
|
// Extract the static properties and add them to a list of propertiesContainer.
|
|
|
|
propertyContainers = []propertiesContainer{}
|
|
|
|
for _, i := range list {
|
|
|
|
propertyContainers = append(propertyContainers, sdkVariantPropertiesContainer{
|
|
|
|
sdkVariant: i.sdkVariant,
|
|
|
|
properties: i.staticProperties,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
commonStaticProperties := &snapshotModuleStaticProperties{}
|
|
|
|
extractor = newCommonValueExtractor(commonStaticProperties)
|
|
|
|
extractCommonProperties(ctx, extractor, &commonStaticProperties, propertyContainers)
|
|
|
|
|
|
|
|
return &combinedSnapshotModuleProperties{
|
|
|
|
sdkVariant: nil,
|
|
|
|
staticProperties: commonStaticProperties,
|
|
|
|
dynamicProperties: commonDynamicProperties,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (s *sdk) addSnapshotPropertiesToPropertySet(builder *snapshotBuilder, propertySet android.BpPropertySet, combined *combinedSnapshotModuleProperties) {
|
|
|
|
staticProperties := combined.staticProperties
|
2021-04-24 13:37:13 +02:00
|
|
|
multilib := staticProperties.Compile_multilib
|
|
|
|
if multilib != "" && multilib != "both" {
|
|
|
|
// Compile_multilib defaults to both so only needs to be set when it's specified and not both.
|
|
|
|
propertySet.AddProperty("compile_multilib", multilib)
|
|
|
|
}
|
|
|
|
|
2021-04-24 12:32:59 +02:00
|
|
|
dynamicMemberTypeListProperties := combined.dynamicProperties
|
2020-03-02 19:38:15 +01:00
|
|
|
for _, memberListProperty := range s.memberListProperties() {
|
|
|
|
names := memberListProperty.getter(dynamicMemberTypeListProperties)
|
|
|
|
if len(names) > 0 {
|
2020-03-06 13:30:43 +01:00
|
|
|
propertySet.AddProperty(memberListProperty.propertyName(), builder.versionedSdkMemberNames(names, false))
|
2020-03-02 19:38:15 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-13 22:03:22 +01:00
|
|
|
type propertyTag struct {
|
|
|
|
name string
|
|
|
|
}
|
|
|
|
|
2020-03-04 15:52:46 +01:00
|
|
|
// A BpPropertyTag to add to a property that contains references to other sdk members.
|
|
|
|
//
|
|
|
|
// This will cause the references to be rewritten to a versioned reference in the version
|
|
|
|
// specific instance of a snapshot module.
|
2020-03-06 13:30:43 +01:00
|
|
|
var requiredSdkMemberReferencePropertyTag = propertyTag{"requiredSdkMemberReferencePropertyTag"}
|
|
|
|
var optionalSdkMemberReferencePropertyTag = propertyTag{"optionalSdkMemberReferencePropertyTag"}
|
2020-01-13 22:03:22 +01:00
|
|
|
|
2020-03-04 15:52:46 +01:00
|
|
|
// A BpPropertyTag that indicates the property should only be present in the versioned
|
|
|
|
// module.
|
|
|
|
//
|
|
|
|
// This will cause the property to be removed from the unversioned instance of a
|
|
|
|
// snapshot module.
|
|
|
|
var sdkVersionedOnlyPropertyTag = propertyTag{"sdkVersionedOnlyPropertyTag"}
|
|
|
|
|
2020-01-15 15:08:51 +01:00
|
|
|
type unversionedToVersionedTransformation struct {
|
|
|
|
identityTransformation
|
|
|
|
builder *snapshotBuilder
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t unversionedToVersionedTransformation) transformModule(module *bpModule) *bpModule {
|
|
|
|
// Use a versioned name for the module but remember the original name for the
|
|
|
|
// snapshot.
|
|
|
|
name := module.getValue("name").(string)
|
2020-03-06 13:30:43 +01:00
|
|
|
module.setProperty("name", t.builder.versionedSdkMemberName(name, true))
|
2020-01-15 15:08:51 +01:00
|
|
|
module.insertAfter("name", "sdk_member_name", name)
|
|
|
|
return module
|
|
|
|
}
|
|
|
|
|
2020-01-13 22:03:22 +01:00
|
|
|
func (t unversionedToVersionedTransformation) transformProperty(name string, value interface{}, tag android.BpPropertyTag) (interface{}, android.BpPropertyTag) {
|
2020-03-06 13:30:43 +01:00
|
|
|
if tag == requiredSdkMemberReferencePropertyTag || tag == optionalSdkMemberReferencePropertyTag {
|
|
|
|
required := tag == requiredSdkMemberReferencePropertyTag
|
|
|
|
return t.builder.versionedSdkMemberNames(value.([]string), required), tag
|
2020-01-13 22:03:22 +01:00
|
|
|
} else {
|
|
|
|
return value, tag
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-20 19:16:30 +01:00
|
|
|
type unversionedTransformation struct {
|
|
|
|
identityTransformation
|
|
|
|
builder *snapshotBuilder
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t unversionedTransformation) transformModule(module *bpModule) *bpModule {
|
|
|
|
// If the module is an internal member then use a unique name for it.
|
|
|
|
name := module.getValue("name").(string)
|
2020-03-06 13:30:43 +01:00
|
|
|
module.setProperty("name", t.builder.unversionedSdkMemberName(name, true))
|
2020-01-20 19:16:30 +01:00
|
|
|
|
|
|
|
// Set prefer: false - this is not strictly required as that is the default.
|
|
|
|
module.insertAfter("name", "prefer", false)
|
|
|
|
|
|
|
|
return module
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t unversionedTransformation) transformProperty(name string, value interface{}, tag android.BpPropertyTag) (interface{}, android.BpPropertyTag) {
|
2020-03-06 13:30:43 +01:00
|
|
|
if tag == requiredSdkMemberReferencePropertyTag || tag == optionalSdkMemberReferencePropertyTag {
|
|
|
|
required := tag == requiredSdkMemberReferencePropertyTag
|
|
|
|
return t.builder.unversionedSdkMemberNames(value.([]string), required), tag
|
2020-03-04 15:52:46 +01:00
|
|
|
} else if tag == sdkVersionedOnlyPropertyTag {
|
|
|
|
// The property is not allowed in the unversioned module so remove it.
|
|
|
|
return nil, nil
|
2020-01-20 19:16:30 +01:00
|
|
|
} else {
|
|
|
|
return value, tag
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-02-21 17:29:35 +01:00
|
|
|
type pruneEmptySetTransformer struct {
|
|
|
|
identityTransformation
|
|
|
|
}
|
|
|
|
|
|
|
|
var _ bpTransformer = (*pruneEmptySetTransformer)(nil)
|
|
|
|
|
|
|
|
func (t pruneEmptySetTransformer) transformPropertySetAfterContents(name string, propertySet *bpPropertySet, tag android.BpPropertyTag) (*bpPropertySet, android.BpPropertyTag) {
|
|
|
|
if len(propertySet.properties) == 0 {
|
|
|
|
return nil, nil
|
|
|
|
} else {
|
|
|
|
return propertySet, tag
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-27 18:43:54 +01:00
|
|
|
func generateBpContents(contents *generatedContents, bpFile *bpFile) {
|
2021-02-17 12:23:00 +01:00
|
|
|
generateFilteredBpContents(contents, bpFile, func(*bpModule) bool {
|
|
|
|
return true
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func generateFilteredBpContents(contents *generatedContents, bpFile *bpFile, moduleFilter func(module *bpModule) bool) {
|
2019-11-27 18:43:54 +01:00
|
|
|
contents.Printfln("// This is auto-generated. DO NOT EDIT.")
|
|
|
|
for _, bpModule := range bpFile.order {
|
2021-02-17 12:23:00 +01:00
|
|
|
if moduleFilter(bpModule) {
|
|
|
|
contents.Printfln("")
|
|
|
|
contents.Printfln("%s {", bpModule.moduleType)
|
|
|
|
outputPropertySet(contents, bpModule.bpPropertySet)
|
|
|
|
contents.Printfln("}")
|
|
|
|
}
|
2019-11-27 18:43:54 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func outputPropertySet(contents *generatedContents, set *bpPropertySet) {
|
|
|
|
contents.Indent()
|
2020-03-11 19:17:42 +01:00
|
|
|
|
|
|
|
// Output the properties first, followed by the nested sets. This ensures a
|
|
|
|
// consistent output irrespective of whether property sets are created before
|
|
|
|
// or after the properties. This simplifies the creation of the module.
|
2019-11-27 18:43:54 +01:00
|
|
|
for _, name := range set.order {
|
2020-01-15 15:23:52 +01:00
|
|
|
value := set.getValue(name)
|
2019-11-27 18:43:54 +01:00
|
|
|
|
2020-03-11 19:17:42 +01:00
|
|
|
switch v := value.(type) {
|
|
|
|
case []string:
|
|
|
|
length := len(v)
|
2019-11-27 18:43:54 +01:00
|
|
|
if length > 1 {
|
|
|
|
contents.Printfln("%s: [", name)
|
|
|
|
contents.Indent()
|
|
|
|
for i := 0; i < length; i = i + 1 {
|
2020-03-11 19:17:42 +01:00
|
|
|
contents.Printfln("%q,", v[i])
|
2019-11-27 18:43:54 +01:00
|
|
|
}
|
|
|
|
contents.Dedent()
|
|
|
|
contents.Printfln("],")
|
|
|
|
} else if length == 0 {
|
|
|
|
contents.Printfln("%s: [],", name)
|
|
|
|
} else {
|
2020-03-11 19:17:42 +01:00
|
|
|
contents.Printfln("%s: [%q],", name, v[0])
|
2019-11-27 18:43:54 +01:00
|
|
|
}
|
|
|
|
|
2020-03-11 19:17:42 +01:00
|
|
|
case bool:
|
|
|
|
contents.Printfln("%s: %t,", name, v)
|
|
|
|
|
|
|
|
case *bpPropertySet:
|
|
|
|
// Do not write property sets in the properties phase.
|
2019-11-27 18:43:54 +01:00
|
|
|
|
|
|
|
default:
|
|
|
|
contents.Printfln("%s: %q,", name, value)
|
|
|
|
}
|
|
|
|
}
|
2020-03-11 19:17:42 +01:00
|
|
|
|
|
|
|
for _, name := range set.order {
|
|
|
|
value := set.getValue(name)
|
|
|
|
|
|
|
|
// Only write property sets in the sets phase.
|
|
|
|
switch v := value.(type) {
|
|
|
|
case *bpPropertySet:
|
|
|
|
contents.Printfln("%s: {", name)
|
|
|
|
outputPropertySet(contents, v)
|
|
|
|
contents.Printfln("},")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-27 18:43:54 +01:00
|
|
|
contents.Dedent()
|
|
|
|
}
|
|
|
|
|
2019-11-26 19:02:20 +01:00
|
|
|
func (s *sdk) GetAndroidBpContentsForTests() string {
|
2019-11-27 18:43:54 +01:00
|
|
|
contents := &generatedContents{}
|
|
|
|
generateBpContents(contents, s.builderForTests.bpFile)
|
|
|
|
return contents.content.String()
|
2019-11-26 19:02:20 +01:00
|
|
|
}
|
|
|
|
|
2021-02-17 12:23:00 +01:00
|
|
|
func (s *sdk) GetUnversionedAndroidBpContentsForTests() string {
|
|
|
|
contents := &generatedContents{}
|
|
|
|
generateFilteredBpContents(contents, s.builderForTests.bpFile, func(module *bpModule) bool {
|
|
|
|
return !strings.Contains(module.properties["name"].(string), "@")
|
|
|
|
})
|
|
|
|
return contents.content.String()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (s *sdk) GetVersionedAndroidBpContentsForTests() string {
|
|
|
|
contents := &generatedContents{}
|
|
|
|
generateFilteredBpContents(contents, s.builderForTests.bpFile, func(module *bpModule) bool {
|
|
|
|
return strings.Contains(module.properties["name"].(string), "@")
|
|
|
|
})
|
|
|
|
return contents.content.String()
|
|
|
|
}
|
|
|
|
|
2019-11-12 20:39:25 +01:00
|
|
|
type snapshotBuilder struct {
|
2019-11-27 18:43:54 +01:00
|
|
|
ctx android.ModuleContext
|
2019-11-26 19:04:12 +01:00
|
|
|
sdk *sdk
|
2019-11-27 18:43:54 +01:00
|
|
|
version string
|
|
|
|
snapshotDir android.OutputPath
|
|
|
|
bpFile *bpFile
|
2019-12-11 19:34:15 +01:00
|
|
|
|
|
|
|
// Map from destination to source of each copy - used to eliminate duplicates and
|
|
|
|
// detect conflicts.
|
|
|
|
copies map[string]string
|
|
|
|
|
2019-11-27 18:43:54 +01:00
|
|
|
filesToZip android.Paths
|
|
|
|
zipsToMerge android.Paths
|
|
|
|
|
|
|
|
prebuiltModules map[string]*bpModule
|
|
|
|
prebuiltOrder []*bpModule
|
2020-03-06 13:30:43 +01:00
|
|
|
|
|
|
|
// The set of all members by name.
|
|
|
|
allMembersByName map[string]struct{}
|
|
|
|
|
|
|
|
// The set of exported members by name.
|
|
|
|
exportedMembersByName map[string]struct{}
|
2019-11-12 20:39:25 +01:00
|
|
|
}
|
2019-10-11 07:59:13 +02:00
|
|
|
|
2019-11-12 20:39:25 +01:00
|
|
|
func (s *snapshotBuilder) CopyToSnapshot(src android.Path, dest string) {
|
2019-12-11 19:34:15 +01:00
|
|
|
if existing, ok := s.copies[dest]; ok {
|
|
|
|
if existing != src.String() {
|
|
|
|
s.ctx.ModuleErrorf("conflicting copy, %s copied from both %s and %s", dest, existing, src)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
path := s.snapshotDir.Join(s.ctx, dest)
|
|
|
|
s.ctx.Build(pctx, android.BuildParams{
|
|
|
|
Rule: android.Cp,
|
|
|
|
Input: src,
|
|
|
|
Output: path,
|
|
|
|
})
|
|
|
|
s.filesToZip = append(s.filesToZip, path)
|
|
|
|
|
|
|
|
s.copies[dest] = src.String()
|
|
|
|
}
|
2019-11-12 20:39:25 +01:00
|
|
|
}
|
2019-10-11 07:59:13 +02:00
|
|
|
|
2019-11-12 20:39:36 +01:00
|
|
|
func (s *snapshotBuilder) UnzipToSnapshot(zipPath android.Path, destDir string) {
|
|
|
|
ctx := s.ctx
|
|
|
|
|
|
|
|
// Repackage the zip file so that the entries are in the destDir directory.
|
|
|
|
// This will allow the zip file to be merged into the snapshot.
|
|
|
|
tmpZipPath := android.PathForModuleOut(ctx, "tmp", destDir+".zip").OutputPath
|
2019-11-29 21:17:53 +01:00
|
|
|
|
|
|
|
ctx.Build(pctx, android.BuildParams{
|
|
|
|
Description: "Repackaging zip file " + destDir + " for snapshot " + ctx.ModuleName(),
|
|
|
|
Rule: repackageZip,
|
|
|
|
Input: zipPath,
|
|
|
|
Output: tmpZipPath,
|
|
|
|
Args: map[string]string{
|
|
|
|
"destdir": destDir,
|
|
|
|
},
|
|
|
|
})
|
2019-11-12 20:39:36 +01:00
|
|
|
|
|
|
|
// Add the repackaged zip file to the files to merge.
|
|
|
|
s.zipsToMerge = append(s.zipsToMerge, tmpZipPath)
|
|
|
|
}
|
|
|
|
|
2019-12-05 19:19:29 +01:00
|
|
|
func (s *snapshotBuilder) AddPrebuiltModule(member android.SdkMember, moduleType string) android.BpModule {
|
|
|
|
name := member.Name()
|
2019-11-27 18:43:54 +01:00
|
|
|
if s.prebuiltModules[name] != nil {
|
|
|
|
panic(fmt.Sprintf("Duplicate module detected, module %s has already been added", name))
|
|
|
|
}
|
|
|
|
|
|
|
|
m := s.bpFile.newModule(moduleType)
|
|
|
|
m.AddProperty("name", name)
|
2019-12-05 15:31:48 +01:00
|
|
|
|
2020-03-04 15:22:45 +01:00
|
|
|
variant := member.Variants()[0]
|
|
|
|
|
2020-03-06 13:30:43 +01:00
|
|
|
if s.isInternalMember(name) {
|
2020-01-20 19:16:30 +01:00
|
|
|
// An internal member is only referenced from the sdk snapshot which is in the
|
|
|
|
// same package so can be marked as private.
|
|
|
|
m.AddProperty("visibility", []string{"//visibility:private"})
|
|
|
|
} else {
|
|
|
|
// Extract visibility information from a member variant. All variants have the same
|
|
|
|
// visibility so it doesn't matter which one is used.
|
2020-09-29 17:01:08 +02:00
|
|
|
visibilityRules := android.EffectiveVisibilityRules(s.ctx, variant)
|
|
|
|
|
|
|
|
// Add any additional visibility rules needed for the prebuilts to reference each other.
|
|
|
|
err := visibilityRules.Widen(s.sdk.properties.Prebuilt_visibility)
|
|
|
|
if err != nil {
|
|
|
|
s.ctx.PropertyErrorf("prebuilt_visibility", "%s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
visibility := visibilityRules.Strings()
|
2020-01-20 19:16:30 +01:00
|
|
|
if len(visibility) != 0 {
|
|
|
|
m.AddProperty("visibility", visibility)
|
|
|
|
}
|
2019-12-05 15:31:48 +01:00
|
|
|
}
|
|
|
|
|
2020-11-03 01:11:09 +01:00
|
|
|
// Where available copy apex_available properties from the member.
|
|
|
|
if apexAware, ok := variant.(interface{ ApexAvailable() []string }); ok {
|
|
|
|
apexAvailable := apexAware.ApexAvailable()
|
|
|
|
if len(apexAvailable) == 0 {
|
|
|
|
// //apex_available:platform is the default.
|
|
|
|
apexAvailable = []string{android.AvailableToPlatform}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add in any baseline apex available settings.
|
|
|
|
apexAvailable = append(apexAvailable, apex.BaselineApexAvailable(member.Name())...)
|
|
|
|
|
|
|
|
// Remove duplicates and sort.
|
|
|
|
apexAvailable = android.FirstUniqueStrings(apexAvailable)
|
|
|
|
sort.Strings(apexAvailable)
|
|
|
|
|
|
|
|
m.AddProperty("apex_available", apexAvailable)
|
|
|
|
}
|
|
|
|
|
2020-03-02 19:38:15 +01:00
|
|
|
deviceSupported := false
|
|
|
|
hostSupported := false
|
|
|
|
|
|
|
|
for _, variant := range member.Variants() {
|
|
|
|
osClass := variant.Target().Os.Class
|
2020-09-14 12:43:17 +02:00
|
|
|
if osClass == android.Host {
|
2020-03-02 19:38:15 +01:00
|
|
|
hostSupported = true
|
|
|
|
} else if osClass == android.Device {
|
|
|
|
deviceSupported = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
addHostDeviceSupportedProperties(deviceSupported, hostSupported, m)
|
2019-11-27 18:43:54 +01:00
|
|
|
|
2020-03-04 15:52:46 +01:00
|
|
|
// Disable installation in the versioned module of those modules that are ever installable.
|
|
|
|
if installable, ok := variant.(interface{ EverInstallable() bool }); ok {
|
|
|
|
if installable.EverInstallable() {
|
|
|
|
m.AddPropertyWithTag("installable", false, sdkVersionedOnlyPropertyTag)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-27 18:43:54 +01:00
|
|
|
s.prebuiltModules[name] = m
|
|
|
|
s.prebuiltOrder = append(s.prebuiltOrder, m)
|
|
|
|
return m
|
2019-11-12 20:39:25 +01:00
|
|
|
}
|
|
|
|
|
2020-03-02 19:38:15 +01:00
|
|
|
func addHostDeviceSupportedProperties(deviceSupported bool, hostSupported bool, bpModule *bpModule) {
|
|
|
|
if !deviceSupported {
|
2019-11-26 19:04:12 +01:00
|
|
|
bpModule.AddProperty("device_supported", false)
|
|
|
|
}
|
2020-03-02 19:38:15 +01:00
|
|
|
if hostSupported {
|
2019-11-26 19:04:12 +01:00
|
|
|
bpModule.AddProperty("host_supported", true)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-06 13:30:43 +01:00
|
|
|
func (s *snapshotBuilder) SdkMemberReferencePropertyTag(required bool) android.BpPropertyTag {
|
|
|
|
if required {
|
|
|
|
return requiredSdkMemberReferencePropertyTag
|
|
|
|
} else {
|
|
|
|
return optionalSdkMemberReferencePropertyTag
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (s *snapshotBuilder) OptionalSdkMemberReferencePropertyTag() android.BpPropertyTag {
|
|
|
|
return optionalSdkMemberReferencePropertyTag
|
2020-01-13 22:03:22 +01:00
|
|
|
}
|
|
|
|
|
2019-11-27 18:43:54 +01:00
|
|
|
// Get a versioned name appropriate for the SDK snapshot version being taken.
|
2020-03-06 13:30:43 +01:00
|
|
|
func (s *snapshotBuilder) versionedSdkMemberName(unversionedName string, required bool) string {
|
|
|
|
if _, ok := s.allMembersByName[unversionedName]; !ok {
|
|
|
|
if required {
|
|
|
|
s.ctx.ModuleErrorf("Required member reference %s is not a member of the sdk", unversionedName)
|
|
|
|
}
|
|
|
|
return unversionedName
|
|
|
|
}
|
2019-11-12 20:39:25 +01:00
|
|
|
return versionedSdkMemberName(s.ctx, unversionedName, s.version)
|
2019-10-11 07:59:13 +02:00
|
|
|
}
|
2019-11-27 18:43:54 +01:00
|
|
|
|
2020-03-06 13:30:43 +01:00
|
|
|
func (s *snapshotBuilder) versionedSdkMemberNames(members []string, required bool) []string {
|
2019-11-27 18:43:54 +01:00
|
|
|
var references []string = nil
|
|
|
|
for _, m := range members {
|
2020-03-06 13:30:43 +01:00
|
|
|
references = append(references, s.versionedSdkMemberName(m, required))
|
2019-11-27 18:43:54 +01:00
|
|
|
}
|
|
|
|
return references
|
|
|
|
}
|
2019-11-28 15:31:38 +01:00
|
|
|
|
2020-01-20 19:16:30 +01:00
|
|
|
// Get an internal name unique to the sdk.
|
2020-03-06 13:30:43 +01:00
|
|
|
func (s *snapshotBuilder) unversionedSdkMemberName(unversionedName string, required bool) string {
|
|
|
|
if _, ok := s.allMembersByName[unversionedName]; !ok {
|
|
|
|
if required {
|
|
|
|
s.ctx.ModuleErrorf("Required member reference %s is not a member of the sdk", unversionedName)
|
|
|
|
}
|
|
|
|
return unversionedName
|
|
|
|
}
|
|
|
|
|
|
|
|
if s.isInternalMember(unversionedName) {
|
2020-01-20 19:16:30 +01:00
|
|
|
return s.ctx.ModuleName() + "_" + unversionedName
|
|
|
|
} else {
|
|
|
|
return unversionedName
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-06 13:30:43 +01:00
|
|
|
func (s *snapshotBuilder) unversionedSdkMemberNames(members []string, required bool) []string {
|
2020-01-20 19:16:30 +01:00
|
|
|
var references []string = nil
|
|
|
|
for _, m := range members {
|
2020-03-06 13:30:43 +01:00
|
|
|
references = append(references, s.unversionedSdkMemberName(m, required))
|
2020-01-20 19:16:30 +01:00
|
|
|
}
|
|
|
|
return references
|
|
|
|
}
|
|
|
|
|
2020-03-06 13:30:43 +01:00
|
|
|
func (s *snapshotBuilder) isInternalMember(memberName string) bool {
|
|
|
|
_, ok := s.exportedMembersByName[memberName]
|
|
|
|
return !ok
|
|
|
|
}
|
|
|
|
|
2020-07-10 01:14:03 +02:00
|
|
|
// Add the properties from the given SdkMemberProperties to the blueprint
|
|
|
|
// property set. This handles common properties in SdkMemberPropertiesBase and
|
|
|
|
// calls the member-specific AddToPropertySet for the rest.
|
|
|
|
func addSdkMemberPropertiesToSet(ctx *memberContext, memberProperties android.SdkMemberProperties, targetPropertySet android.BpPropertySet) {
|
|
|
|
if memberProperties.Base().Compile_multilib != "" {
|
|
|
|
targetPropertySet.AddProperty("compile_multilib", memberProperties.Base().Compile_multilib)
|
|
|
|
}
|
|
|
|
|
|
|
|
memberProperties.AddToPropertySet(ctx, targetPropertySet)
|
|
|
|
}
|
|
|
|
|
2021-04-24 13:16:36 +02:00
|
|
|
// sdkMemberVariantDep represents a dependency from an sdk variant onto a member variant.
|
|
|
|
type sdkMemberVariantDep struct {
|
2021-04-24 01:47:29 +02:00
|
|
|
// The sdk variant that depends (possibly indirectly) on the member variant.
|
|
|
|
sdkVariant *sdk
|
2020-02-25 20:26:33 +01:00
|
|
|
memberType android.SdkMemberType
|
|
|
|
variant android.SdkAware
|
2021-04-23 22:20:20 +02:00
|
|
|
export bool
|
2020-02-25 20:26:33 +01:00
|
|
|
}
|
|
|
|
|
2019-11-28 15:31:38 +01:00
|
|
|
var _ android.SdkMember = (*sdkMember)(nil)
|
|
|
|
|
2021-04-24 13:16:36 +02:00
|
|
|
// sdkMember groups all the variants of a specific member module together along with the name of the
|
|
|
|
// module and the member type. This is used to generate the prebuilt modules for a specific member.
|
2019-11-28 15:31:38 +01:00
|
|
|
type sdkMember struct {
|
|
|
|
memberType android.SdkMemberType
|
|
|
|
name string
|
|
|
|
variants []android.SdkAware
|
|
|
|
}
|
|
|
|
|
|
|
|
func (m *sdkMember) Name() string {
|
|
|
|
return m.name
|
|
|
|
}
|
|
|
|
|
|
|
|
func (m *sdkMember) Variants() []android.SdkAware {
|
|
|
|
return m.variants
|
|
|
|
}
|
2020-02-27 17:00:53 +01:00
|
|
|
|
2020-03-16 20:52:08 +01:00
|
|
|
// Track usages of multilib variants.
|
|
|
|
type multilibUsage int
|
|
|
|
|
|
|
|
const (
|
|
|
|
multilibNone multilibUsage = 0
|
|
|
|
multilib32 multilibUsage = 1
|
|
|
|
multilib64 multilibUsage = 2
|
|
|
|
multilibBoth = multilib32 | multilib64
|
|
|
|
)
|
|
|
|
|
|
|
|
// Add the multilib that is used in the arch type.
|
|
|
|
func (m multilibUsage) addArchType(archType android.ArchType) multilibUsage {
|
|
|
|
multilib := archType.Multilib
|
|
|
|
switch multilib {
|
|
|
|
case "":
|
|
|
|
return m
|
|
|
|
case "lib32":
|
|
|
|
return m | multilib32
|
|
|
|
case "lib64":
|
|
|
|
return m | multilib64
|
|
|
|
default:
|
|
|
|
panic(fmt.Errorf("Unknown Multilib field in ArchType, expected 'lib32' or 'lib64', found %q", multilib))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (m multilibUsage) String() string {
|
|
|
|
switch m {
|
|
|
|
case multilibNone:
|
|
|
|
return ""
|
|
|
|
case multilib32:
|
|
|
|
return "32"
|
|
|
|
case multilib64:
|
|
|
|
return "64"
|
|
|
|
case multilibBoth:
|
|
|
|
return "both"
|
|
|
|
default:
|
|
|
|
panic(fmt.Errorf("Unknown multilib value, found %b, expected one of %b, %b, %b or %b",
|
|
|
|
m, multilibNone, multilib32, multilib64, multilibBoth))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-02-27 17:00:53 +01:00
|
|
|
type baseInfo struct {
|
|
|
|
Properties android.SdkMemberProperties
|
|
|
|
}
|
|
|
|
|
2020-04-30 16:48:31 +02:00
|
|
|
func (b *baseInfo) optimizableProperties() interface{} {
|
|
|
|
return b.Properties
|
|
|
|
}
|
|
|
|
|
2020-02-27 17:00:53 +01:00
|
|
|
type osTypeSpecificInfo struct {
|
|
|
|
baseInfo
|
|
|
|
|
2020-03-12 21:40:35 +01:00
|
|
|
osType android.OsType
|
|
|
|
|
2020-02-27 17:00:53 +01:00
|
|
|
// The list of arch type specific info for this os type.
|
2020-03-17 11:58:23 +01:00
|
|
|
//
|
|
|
|
// Nil if there is one variant whose arch type is common
|
|
|
|
archInfos []*archTypeSpecificInfo
|
2020-02-27 17:00:53 +01:00
|
|
|
}
|
|
|
|
|
2020-05-06 13:35:38 +02:00
|
|
|
var _ propertiesContainer = (*osTypeSpecificInfo)(nil)
|
|
|
|
|
2020-03-17 13:51:37 +01:00
|
|
|
type variantPropertiesFactoryFunc func() android.SdkMemberProperties
|
|
|
|
|
2020-03-12 21:40:35 +01:00
|
|
|
// Create a new osTypeSpecificInfo for the specified os type and its properties
|
|
|
|
// structures populated with information from the variants.
|
2020-03-19 17:11:18 +01:00
|
|
|
func newOsTypeSpecificInfo(ctx android.SdkMemberContext, osType android.OsType, variantPropertiesFactory variantPropertiesFactoryFunc, osTypeVariants []android.Module) *osTypeSpecificInfo {
|
2020-03-12 21:40:35 +01:00
|
|
|
osInfo := &osTypeSpecificInfo{
|
|
|
|
osType: osType,
|
|
|
|
}
|
|
|
|
|
|
|
|
osSpecificVariantPropertiesFactory := func() android.SdkMemberProperties {
|
|
|
|
properties := variantPropertiesFactory()
|
|
|
|
properties.Base().Os = osType
|
|
|
|
return properties
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create a structure into which properties common across the architectures in
|
|
|
|
// this os type will be stored.
|
|
|
|
osInfo.Properties = osSpecificVariantPropertiesFactory()
|
|
|
|
|
|
|
|
// Group the variants by arch type.
|
2020-03-19 17:11:18 +01:00
|
|
|
var variantsByArchName = make(map[string][]android.Module)
|
2020-03-12 21:40:35 +01:00
|
|
|
var archTypes []android.ArchType
|
|
|
|
for _, variant := range osTypeVariants {
|
|
|
|
archType := variant.Target().Arch.ArchType
|
|
|
|
archTypeName := archType.Name
|
|
|
|
if _, ok := variantsByArchName[archTypeName]; !ok {
|
|
|
|
archTypes = append(archTypes, archType)
|
|
|
|
}
|
|
|
|
|
|
|
|
variantsByArchName[archTypeName] = append(variantsByArchName[archTypeName], variant)
|
|
|
|
}
|
|
|
|
|
|
|
|
if commonVariants, ok := variantsByArchName["common"]; ok {
|
|
|
|
if len(osTypeVariants) != 1 {
|
2020-07-07 02:41:08 +02:00
|
|
|
panic(fmt.Errorf("Expected to only have 1 variant when arch type is common but found %d", len(osTypeVariants)))
|
2020-03-12 21:40:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// A common arch type only has one variant and its properties should be treated
|
|
|
|
// as common to the os type.
|
2020-03-19 17:11:18 +01:00
|
|
|
osInfo.Properties.PopulateFromVariant(ctx, commonVariants[0])
|
2020-03-12 21:40:35 +01:00
|
|
|
} else {
|
|
|
|
// Create an arch specific info for each supported architecture type.
|
|
|
|
for _, archType := range archTypes {
|
|
|
|
archTypeName := archType.Name
|
|
|
|
|
|
|
|
archVariants := variantsByArchName[archTypeName]
|
Enable sdk and sdk members in os_arch granularity
This amends Idad7ef138cdbcbd209d390bf6c10ca8365d4619f. With the change,
when there is a member that returns IsHostOsDependent() == true,
the sdk having the member and the member itself are disable for host and
only the os that the member supports is explicitly enabled.
However, that change will cause a problem when we add the support for
the linux_bionic_arm64 target. The target is not enabled when building
sdk snapshots. The only linux_bionic target that is enabled is
'linux_bionic_x86_64'. However, since the granularity is os which is
linux_bionic, the snapshot is generated as follows.
cc_prebuilt_binary {
target: {
host: {
enabled: false,
},
linux_bionic: {
enabled: true,
},
linux_bionic_x86_64: {
srcs: ["x86_64/bin/..."],
},
// no srcs for linux_bionic_arm64
},
}
Above is a problem for linux_bionic_arm64 target because the target is
enabled (via linux_bionic.enabled: true), but srcs is not provided.
To fix the problem, the enabling of a target is done in a target
(os_arch) granularity, rather than os granularity. For example, above
now becomes ...
cc_prebuilt_binary {
target: {
host: {
enabled: false,
},
linux_bionic_x86_64: {
enabled: true,
srcs: ["x86_64/bin/..."],
},
},
}
Only the targets that the snapshot actually can provide srcs are enabled
and the rest of the host targets are disabled.
Bug: 159685774
Test: m nothing
Test: build/soong/scripts/build-aml-prebuilts.sh
runtime-module-host-exports
Change-Id: Ibca48c40f6dc4628b5f4bfa4ceb68ebe0973cc81
2020-10-19 15:47:34 +02:00
|
|
|
archInfo := newArchSpecificInfo(ctx, archType, osType, osSpecificVariantPropertiesFactory, archVariants)
|
2020-03-12 21:40:35 +01:00
|
|
|
|
|
|
|
osInfo.archInfos = append(osInfo.archInfos, archInfo)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return osInfo
|
|
|
|
}
|
|
|
|
|
|
|
|
// Optimize the properties by extracting common properties from arch type specific
|
|
|
|
// properties into os type specific properties.
|
2020-05-06 13:35:38 +02:00
|
|
|
func (osInfo *osTypeSpecificInfo) optimizeProperties(ctx *memberContext, commonValueExtractor *commonValueExtractor) {
|
2020-03-12 21:40:35 +01:00
|
|
|
// Nothing to do if there is only a single common architecture.
|
|
|
|
if len(osInfo.archInfos) == 0 {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2020-03-16 20:52:08 +01:00
|
|
|
multilib := multilibNone
|
2020-03-12 21:40:35 +01:00
|
|
|
for _, archInfo := range osInfo.archInfos {
|
2020-03-16 20:52:08 +01:00
|
|
|
multilib = multilib.addArchType(archInfo.archType)
|
|
|
|
|
2020-03-12 11:24:35 +01:00
|
|
|
// Optimize the arch properties first.
|
2020-05-06 13:35:38 +02:00
|
|
|
archInfo.optimizeProperties(ctx, commonValueExtractor)
|
2020-03-12 21:40:35 +01:00
|
|
|
}
|
|
|
|
|
2020-05-06 13:35:38 +02:00
|
|
|
extractCommonProperties(ctx.sdkMemberContext, commonValueExtractor, osInfo.Properties, osInfo.archInfos)
|
2020-03-12 21:40:35 +01:00
|
|
|
|
|
|
|
// Choose setting for compile_multilib that is appropriate for the arch variants supplied.
|
2020-03-16 20:52:08 +01:00
|
|
|
osInfo.Properties.Base().Compile_multilib = multilib.String()
|
2020-03-12 21:40:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Add the properties for an os to a property set.
|
|
|
|
//
|
|
|
|
// Maps the properties related to the os variants through to an appropriate
|
|
|
|
// module structure that will produce equivalent set of variants when it is
|
|
|
|
// processed in a build.
|
2020-03-19 17:11:18 +01:00
|
|
|
func (osInfo *osTypeSpecificInfo) addToPropertySet(ctx *memberContext, bpModule android.BpModule, targetPropertySet android.BpPropertySet) {
|
2020-03-12 21:40:35 +01:00
|
|
|
|
|
|
|
var osPropertySet android.BpPropertySet
|
|
|
|
var archPropertySet android.BpPropertySet
|
|
|
|
var archOsPrefix string
|
2020-07-11 05:52:24 +02:00
|
|
|
if osInfo.Properties.Base().Os_count == 1 &&
|
|
|
|
(osInfo.osType.Class == android.Device || !ctx.memberType.IsHostOsDependent()) {
|
|
|
|
// There is only one OS type present in the variants and it shouldn't have a
|
|
|
|
// variant-specific target. The latter is the case if it's either for device
|
|
|
|
// where there is only one OS (android), or for host and the member type
|
|
|
|
// isn't host OS dependent.
|
2020-03-12 21:40:35 +01:00
|
|
|
|
|
|
|
// Create a structure that looks like:
|
|
|
|
// module_type {
|
|
|
|
// name: "...",
|
|
|
|
// ...
|
|
|
|
// <common properties>
|
|
|
|
// ...
|
|
|
|
// <single os type specific properties>
|
|
|
|
//
|
|
|
|
// arch: {
|
|
|
|
// <arch specific sections>
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
osPropertySet = bpModule
|
|
|
|
archPropertySet = osPropertySet.AddPropertySet("arch")
|
|
|
|
|
|
|
|
// Arch specific properties need to be added to an arch specific section
|
|
|
|
// within arch.
|
|
|
|
archOsPrefix = ""
|
|
|
|
} else {
|
|
|
|
// Create a structure that looks like:
|
|
|
|
// module_type {
|
|
|
|
// name: "...",
|
|
|
|
// ...
|
|
|
|
// <common properties>
|
|
|
|
// ...
|
|
|
|
// target: {
|
|
|
|
// <arch independent os specific sections, e.g. android>
|
|
|
|
// ...
|
|
|
|
// <arch and os specific sections, e.g. android_x86>
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
osType := osInfo.osType
|
|
|
|
osPropertySet = targetPropertySet.AddPropertySet(osType.Name)
|
|
|
|
archPropertySet = targetPropertySet
|
|
|
|
|
|
|
|
// Arch specific properties need to be added to an os and arch specific
|
|
|
|
// section prefixed with <os>_.
|
|
|
|
archOsPrefix = osType.Name + "_"
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add the os specific but arch independent properties to the module.
|
2020-07-10 01:14:03 +02:00
|
|
|
addSdkMemberPropertiesToSet(ctx, osInfo.Properties, osPropertySet)
|
2020-03-12 21:40:35 +01:00
|
|
|
|
|
|
|
// Add arch (and possibly os) specific sections for each set of arch (and possibly
|
|
|
|
// os) specific properties.
|
|
|
|
//
|
|
|
|
// The archInfos list will be empty if the os contains variants for the common
|
|
|
|
// architecture.
|
|
|
|
for _, archInfo := range osInfo.archInfos {
|
2020-03-19 17:11:18 +01:00
|
|
|
archInfo.addToPropertySet(ctx, archPropertySet, archOsPrefix)
|
2020-03-12 21:40:35 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-04 16:32:08 +02:00
|
|
|
func (osInfo *osTypeSpecificInfo) isHostVariant() bool {
|
|
|
|
osClass := osInfo.osType.Class
|
2020-09-14 12:43:17 +02:00
|
|
|
return osClass == android.Host
|
2020-05-04 16:32:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
var _ isHostVariant = (*osTypeSpecificInfo)(nil)
|
|
|
|
|
2020-05-06 13:35:38 +02:00
|
|
|
func (osInfo *osTypeSpecificInfo) String() string {
|
|
|
|
return fmt.Sprintf("OsType{%s}", osInfo.osType)
|
|
|
|
}
|
|
|
|
|
2020-02-27 17:00:53 +01:00
|
|
|
type archTypeSpecificInfo struct {
|
|
|
|
baseInfo
|
|
|
|
|
|
|
|
archType android.ArchType
|
Enable sdk and sdk members in os_arch granularity
This amends Idad7ef138cdbcbd209d390bf6c10ca8365d4619f. With the change,
when there is a member that returns IsHostOsDependent() == true,
the sdk having the member and the member itself are disable for host and
only the os that the member supports is explicitly enabled.
However, that change will cause a problem when we add the support for
the linux_bionic_arm64 target. The target is not enabled when building
sdk snapshots. The only linux_bionic target that is enabled is
'linux_bionic_x86_64'. However, since the granularity is os which is
linux_bionic, the snapshot is generated as follows.
cc_prebuilt_binary {
target: {
host: {
enabled: false,
},
linux_bionic: {
enabled: true,
},
linux_bionic_x86_64: {
srcs: ["x86_64/bin/..."],
},
// no srcs for linux_bionic_arm64
},
}
Above is a problem for linux_bionic_arm64 target because the target is
enabled (via linux_bionic.enabled: true), but srcs is not provided.
To fix the problem, the enabling of a target is done in a target
(os_arch) granularity, rather than os granularity. For example, above
now becomes ...
cc_prebuilt_binary {
target: {
host: {
enabled: false,
},
linux_bionic_x86_64: {
enabled: true,
srcs: ["x86_64/bin/..."],
},
},
}
Only the targets that the snapshot actually can provide srcs are enabled
and the rest of the host targets are disabled.
Bug: 159685774
Test: m nothing
Test: build/soong/scripts/build-aml-prebuilts.sh
runtime-module-host-exports
Change-Id: Ibca48c40f6dc4628b5f4bfa4ceb68ebe0973cc81
2020-10-19 15:47:34 +02:00
|
|
|
osType android.OsType
|
2020-03-12 11:24:35 +01:00
|
|
|
|
|
|
|
linkInfos []*linkTypeSpecificInfo
|
2020-02-27 17:00:53 +01:00
|
|
|
}
|
|
|
|
|
2020-05-06 13:35:38 +02:00
|
|
|
var _ propertiesContainer = (*archTypeSpecificInfo)(nil)
|
|
|
|
|
2020-03-17 13:51:37 +01:00
|
|
|
// Create a new archTypeSpecificInfo for the specified arch type and its properties
|
|
|
|
// structures populated with information from the variants.
|
Enable sdk and sdk members in os_arch granularity
This amends Idad7ef138cdbcbd209d390bf6c10ca8365d4619f. With the change,
when there is a member that returns IsHostOsDependent() == true,
the sdk having the member and the member itself are disable for host and
only the os that the member supports is explicitly enabled.
However, that change will cause a problem when we add the support for
the linux_bionic_arm64 target. The target is not enabled when building
sdk snapshots. The only linux_bionic target that is enabled is
'linux_bionic_x86_64'. However, since the granularity is os which is
linux_bionic, the snapshot is generated as follows.
cc_prebuilt_binary {
target: {
host: {
enabled: false,
},
linux_bionic: {
enabled: true,
},
linux_bionic_x86_64: {
srcs: ["x86_64/bin/..."],
},
// no srcs for linux_bionic_arm64
},
}
Above is a problem for linux_bionic_arm64 target because the target is
enabled (via linux_bionic.enabled: true), but srcs is not provided.
To fix the problem, the enabling of a target is done in a target
(os_arch) granularity, rather than os granularity. For example, above
now becomes ...
cc_prebuilt_binary {
target: {
host: {
enabled: false,
},
linux_bionic_x86_64: {
enabled: true,
srcs: ["x86_64/bin/..."],
},
},
}
Only the targets that the snapshot actually can provide srcs are enabled
and the rest of the host targets are disabled.
Bug: 159685774
Test: m nothing
Test: build/soong/scripts/build-aml-prebuilts.sh
runtime-module-host-exports
Change-Id: Ibca48c40f6dc4628b5f4bfa4ceb68ebe0973cc81
2020-10-19 15:47:34 +02:00
|
|
|
func newArchSpecificInfo(ctx android.SdkMemberContext, archType android.ArchType, osType android.OsType, variantPropertiesFactory variantPropertiesFactoryFunc, archVariants []android.Module) *archTypeSpecificInfo {
|
2020-03-17 13:51:37 +01:00
|
|
|
|
|
|
|
// Create an arch specific info into which the variant properties can be copied.
|
Enable sdk and sdk members in os_arch granularity
This amends Idad7ef138cdbcbd209d390bf6c10ca8365d4619f. With the change,
when there is a member that returns IsHostOsDependent() == true,
the sdk having the member and the member itself are disable for host and
only the os that the member supports is explicitly enabled.
However, that change will cause a problem when we add the support for
the linux_bionic_arm64 target. The target is not enabled when building
sdk snapshots. The only linux_bionic target that is enabled is
'linux_bionic_x86_64'. However, since the granularity is os which is
linux_bionic, the snapshot is generated as follows.
cc_prebuilt_binary {
target: {
host: {
enabled: false,
},
linux_bionic: {
enabled: true,
},
linux_bionic_x86_64: {
srcs: ["x86_64/bin/..."],
},
// no srcs for linux_bionic_arm64
},
}
Above is a problem for linux_bionic_arm64 target because the target is
enabled (via linux_bionic.enabled: true), but srcs is not provided.
To fix the problem, the enabling of a target is done in a target
(os_arch) granularity, rather than os granularity. For example, above
now becomes ...
cc_prebuilt_binary {
target: {
host: {
enabled: false,
},
linux_bionic_x86_64: {
enabled: true,
srcs: ["x86_64/bin/..."],
},
},
}
Only the targets that the snapshot actually can provide srcs are enabled
and the rest of the host targets are disabled.
Bug: 159685774
Test: m nothing
Test: build/soong/scripts/build-aml-prebuilts.sh
runtime-module-host-exports
Change-Id: Ibca48c40f6dc4628b5f4bfa4ceb68ebe0973cc81
2020-10-19 15:47:34 +02:00
|
|
|
archInfo := &archTypeSpecificInfo{archType: archType, osType: osType}
|
2020-03-17 13:51:37 +01:00
|
|
|
|
|
|
|
// Create the properties into which the arch type specific properties will be
|
|
|
|
// added.
|
|
|
|
archInfo.Properties = variantPropertiesFactory()
|
2020-03-12 11:24:35 +01:00
|
|
|
|
|
|
|
if len(archVariants) == 1 {
|
2020-03-19 17:11:18 +01:00
|
|
|
archInfo.Properties.PopulateFromVariant(ctx, archVariants[0])
|
2020-03-12 11:24:35 +01:00
|
|
|
} else {
|
|
|
|
// There is more than one variant for this arch type which must be differentiated
|
|
|
|
// by link type.
|
|
|
|
for _, linkVariant := range archVariants {
|
|
|
|
linkType := getLinkType(linkVariant)
|
|
|
|
if linkType == "" {
|
|
|
|
panic(fmt.Errorf("expected one arch specific variant as it is not identified by link type but found %d", len(archVariants)))
|
|
|
|
} else {
|
2020-03-19 17:11:18 +01:00
|
|
|
linkInfo := newLinkSpecificInfo(ctx, linkType, variantPropertiesFactory, linkVariant)
|
2020-03-12 11:24:35 +01:00
|
|
|
|
|
|
|
archInfo.linkInfos = append(archInfo.linkInfos, linkInfo)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-03-17 13:51:37 +01:00
|
|
|
|
|
|
|
return archInfo
|
|
|
|
}
|
|
|
|
|
2020-04-30 16:48:31 +02:00
|
|
|
func (archInfo *archTypeSpecificInfo) optimizableProperties() interface{} {
|
|
|
|
return archInfo.Properties
|
|
|
|
}
|
|
|
|
|
2020-03-12 11:24:35 +01:00
|
|
|
// Get the link type of the variant
|
|
|
|
//
|
|
|
|
// If the variant is not differentiated by link type then it returns "",
|
|
|
|
// otherwise it returns one of "static" or "shared".
|
|
|
|
func getLinkType(variant android.Module) string {
|
|
|
|
linkType := ""
|
|
|
|
if linkable, ok := variant.(cc.LinkableInterface); ok {
|
|
|
|
if linkable.Shared() && linkable.Static() {
|
|
|
|
panic(fmt.Errorf("expected variant %q to be either static or shared but was both", variant.String()))
|
|
|
|
} else if linkable.Shared() {
|
|
|
|
linkType = "shared"
|
|
|
|
} else if linkable.Static() {
|
|
|
|
linkType = "static"
|
|
|
|
} else {
|
|
|
|
panic(fmt.Errorf("expected variant %q to be either static or shared but was neither", variant.String()))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return linkType
|
|
|
|
}
|
|
|
|
|
|
|
|
// Optimize the properties by extracting common properties from link type specific
|
|
|
|
// properties into arch type specific properties.
|
2020-05-06 13:35:38 +02:00
|
|
|
func (archInfo *archTypeSpecificInfo) optimizeProperties(ctx *memberContext, commonValueExtractor *commonValueExtractor) {
|
2020-03-12 11:24:35 +01:00
|
|
|
if len(archInfo.linkInfos) == 0 {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2020-05-06 13:35:38 +02:00
|
|
|
extractCommonProperties(ctx.sdkMemberContext, commonValueExtractor, archInfo.Properties, archInfo.linkInfos)
|
2020-03-12 11:24:35 +01:00
|
|
|
}
|
|
|
|
|
2020-03-17 13:51:37 +01:00
|
|
|
// Add the properties for an arch type to a property set.
|
2020-03-19 17:11:18 +01:00
|
|
|
func (archInfo *archTypeSpecificInfo) addToPropertySet(ctx *memberContext, archPropertySet android.BpPropertySet, archOsPrefix string) {
|
2020-03-17 13:51:37 +01:00
|
|
|
archTypeName := archInfo.archType.Name
|
|
|
|
archTypePropertySet := archPropertySet.AddPropertySet(archOsPrefix + archTypeName)
|
Enable sdk and sdk members in os_arch granularity
This amends Idad7ef138cdbcbd209d390bf6c10ca8365d4619f. With the change,
when there is a member that returns IsHostOsDependent() == true,
the sdk having the member and the member itself are disable for host and
only the os that the member supports is explicitly enabled.
However, that change will cause a problem when we add the support for
the linux_bionic_arm64 target. The target is not enabled when building
sdk snapshots. The only linux_bionic target that is enabled is
'linux_bionic_x86_64'. However, since the granularity is os which is
linux_bionic, the snapshot is generated as follows.
cc_prebuilt_binary {
target: {
host: {
enabled: false,
},
linux_bionic: {
enabled: true,
},
linux_bionic_x86_64: {
srcs: ["x86_64/bin/..."],
},
// no srcs for linux_bionic_arm64
},
}
Above is a problem for linux_bionic_arm64 target because the target is
enabled (via linux_bionic.enabled: true), but srcs is not provided.
To fix the problem, the enabling of a target is done in a target
(os_arch) granularity, rather than os granularity. For example, above
now becomes ...
cc_prebuilt_binary {
target: {
host: {
enabled: false,
},
linux_bionic_x86_64: {
enabled: true,
srcs: ["x86_64/bin/..."],
},
},
}
Only the targets that the snapshot actually can provide srcs are enabled
and the rest of the host targets are disabled.
Bug: 159685774
Test: m nothing
Test: build/soong/scripts/build-aml-prebuilts.sh
runtime-module-host-exports
Change-Id: Ibca48c40f6dc4628b5f4bfa4ceb68ebe0973cc81
2020-10-19 15:47:34 +02:00
|
|
|
// Enable the <os>_<arch> variant explicitly when we've disabled it by default on host.
|
|
|
|
if ctx.memberType.IsHostOsDependent() && archInfo.osType.Class == android.Host {
|
|
|
|
archTypePropertySet.AddProperty("enabled", true)
|
|
|
|
}
|
2020-07-10 01:14:03 +02:00
|
|
|
addSdkMemberPropertiesToSet(ctx, archInfo.Properties, archTypePropertySet)
|
2020-03-12 11:24:35 +01:00
|
|
|
|
|
|
|
for _, linkInfo := range archInfo.linkInfos {
|
|
|
|
linkPropertySet := archTypePropertySet.AddPropertySet(linkInfo.linkType)
|
2020-07-10 01:14:03 +02:00
|
|
|
addSdkMemberPropertiesToSet(ctx, linkInfo.Properties, linkPropertySet)
|
2020-03-12 11:24:35 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-06 13:35:38 +02:00
|
|
|
func (archInfo *archTypeSpecificInfo) String() string {
|
|
|
|
return fmt.Sprintf("ArchType{%s}", archInfo.archType)
|
|
|
|
}
|
|
|
|
|
2020-03-12 11:24:35 +01:00
|
|
|
type linkTypeSpecificInfo struct {
|
|
|
|
baseInfo
|
|
|
|
|
|
|
|
linkType string
|
|
|
|
}
|
|
|
|
|
2020-05-06 13:35:38 +02:00
|
|
|
var _ propertiesContainer = (*linkTypeSpecificInfo)(nil)
|
|
|
|
|
2020-03-12 11:24:35 +01:00
|
|
|
// Create a new linkTypeSpecificInfo for the specified link type and its properties
|
|
|
|
// structures populated with information from the variant.
|
2020-03-19 17:11:18 +01:00
|
|
|
func newLinkSpecificInfo(ctx android.SdkMemberContext, linkType string, variantPropertiesFactory variantPropertiesFactoryFunc, linkVariant android.Module) *linkTypeSpecificInfo {
|
2020-03-12 11:24:35 +01:00
|
|
|
linkInfo := &linkTypeSpecificInfo{
|
|
|
|
baseInfo: baseInfo{
|
|
|
|
// Create the properties into which the link type specific properties will be
|
|
|
|
// added.
|
|
|
|
Properties: variantPropertiesFactory(),
|
|
|
|
},
|
|
|
|
linkType: linkType,
|
|
|
|
}
|
2020-03-19 17:11:18 +01:00
|
|
|
linkInfo.Properties.PopulateFromVariant(ctx, linkVariant)
|
2020-03-12 11:24:35 +01:00
|
|
|
return linkInfo
|
2020-03-17 13:51:37 +01:00
|
|
|
}
|
|
|
|
|
2020-05-06 13:35:38 +02:00
|
|
|
func (l *linkTypeSpecificInfo) String() string {
|
|
|
|
return fmt.Sprintf("LinkType{%s}", l.linkType)
|
|
|
|
}
|
|
|
|
|
2020-03-19 17:11:18 +01:00
|
|
|
type memberContext struct {
|
|
|
|
sdkMemberContext android.ModuleContext
|
|
|
|
builder *snapshotBuilder
|
2020-03-17 22:04:24 +01:00
|
|
|
memberType android.SdkMemberType
|
|
|
|
name string
|
2020-03-19 17:11:18 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
func (m *memberContext) SdkModuleContext() android.ModuleContext {
|
|
|
|
return m.sdkMemberContext
|
|
|
|
}
|
|
|
|
|
|
|
|
func (m *memberContext) SnapshotBuilder() android.SnapshotBuilder {
|
|
|
|
return m.builder
|
|
|
|
}
|
|
|
|
|
2020-03-17 22:04:24 +01:00
|
|
|
func (m *memberContext) MemberType() android.SdkMemberType {
|
|
|
|
return m.memberType
|
|
|
|
}
|
|
|
|
|
|
|
|
func (m *memberContext) Name() string {
|
|
|
|
return m.name
|
|
|
|
}
|
|
|
|
|
2020-07-11 05:52:24 +02:00
|
|
|
func (s *sdk) createMemberSnapshot(ctx *memberContext, member *sdkMember, bpModule *bpModule) {
|
2020-02-27 17:00:53 +01:00
|
|
|
|
|
|
|
memberType := member.memberType
|
|
|
|
|
2020-03-02 11:16:35 +01:00
|
|
|
// Group the variants by os type.
|
2020-03-19 17:11:18 +01:00
|
|
|
variantsByOsType := make(map[android.OsType][]android.Module)
|
2020-02-27 17:00:53 +01:00
|
|
|
variants := member.Variants()
|
|
|
|
for _, variant := range variants {
|
2020-03-02 11:16:35 +01:00
|
|
|
osType := variant.Target().Os
|
|
|
|
variantsByOsType[osType] = append(variantsByOsType[osType], variant)
|
|
|
|
}
|
2020-02-27 17:00:53 +01:00
|
|
|
|
2020-03-02 11:16:35 +01:00
|
|
|
osCount := len(variantsByOsType)
|
2020-03-17 11:58:23 +01:00
|
|
|
variantPropertiesFactory := func() android.SdkMemberProperties {
|
2020-03-02 11:16:35 +01:00
|
|
|
properties := memberType.CreateVariantPropertiesStruct()
|
|
|
|
base := properties.Base()
|
|
|
|
base.Os_count = osCount
|
|
|
|
return properties
|
|
|
|
}
|
2020-02-27 17:00:53 +01:00
|
|
|
|
2020-03-02 11:16:35 +01:00
|
|
|
osTypeToInfo := make(map[android.OsType]*osTypeSpecificInfo)
|
2020-02-27 17:00:53 +01:00
|
|
|
|
2020-03-02 11:16:35 +01:00
|
|
|
// The set of properties that are common across all architectures and os types.
|
2020-03-17 11:58:23 +01:00
|
|
|
commonProperties := variantPropertiesFactory()
|
|
|
|
commonProperties.Base().Os = android.CommonOS
|
2020-03-02 12:33:02 +01:00
|
|
|
|
2020-03-10 23:50:03 +01:00
|
|
|
// Create common value extractor that can be used to optimize the properties.
|
|
|
|
commonValueExtractor := newCommonValueExtractor(commonProperties)
|
|
|
|
|
2020-03-02 11:16:35 +01:00
|
|
|
// The list of property structures which are os type specific but common across
|
|
|
|
// architectures within that os type.
|
2020-04-30 16:48:31 +02:00
|
|
|
var osSpecificPropertiesContainers []*osTypeSpecificInfo
|
2020-02-27 17:00:53 +01:00
|
|
|
|
2020-03-02 11:16:35 +01:00
|
|
|
for osType, osTypeVariants := range variantsByOsType {
|
2020-03-19 17:11:18 +01:00
|
|
|
osInfo := newOsTypeSpecificInfo(ctx, osType, variantPropertiesFactory, osTypeVariants)
|
2020-03-02 11:16:35 +01:00
|
|
|
osTypeToInfo[osType] = osInfo
|
2020-03-17 11:58:23 +01:00
|
|
|
// Add the os specific properties to a list of os type specific yet architecture
|
|
|
|
// independent properties structs.
|
2020-04-30 16:48:31 +02:00
|
|
|
osSpecificPropertiesContainers = append(osSpecificPropertiesContainers, osInfo)
|
2020-03-02 11:16:35 +01:00
|
|
|
|
2020-03-12 21:40:35 +01:00
|
|
|
// Optimize the properties across all the variants for a specific os type.
|
2020-05-06 13:35:38 +02:00
|
|
|
osInfo.optimizeProperties(ctx, commonValueExtractor)
|
2020-03-02 12:33:02 +01:00
|
|
|
}
|
2020-02-27 17:00:53 +01:00
|
|
|
|
2020-03-02 11:16:35 +01:00
|
|
|
// Extract properties which are common across all architectures and os types.
|
2020-05-06 13:35:38 +02:00
|
|
|
extractCommonProperties(ctx.sdkMemberContext, commonValueExtractor, commonProperties, osSpecificPropertiesContainers)
|
2020-02-27 17:00:53 +01:00
|
|
|
|
2020-03-02 11:16:35 +01:00
|
|
|
// Add the common properties to the module.
|
2020-07-10 01:14:03 +02:00
|
|
|
addSdkMemberPropertiesToSet(ctx, commonProperties, bpModule)
|
2020-02-27 17:00:53 +01:00
|
|
|
|
2020-03-02 11:16:35 +01:00
|
|
|
// Create a target property set into which target specific properties can be
|
|
|
|
// added.
|
|
|
|
targetPropertySet := bpModule.AddPropertySet("target")
|
|
|
|
|
2020-07-11 05:52:24 +02:00
|
|
|
// If the member is host OS dependent and has host_supported then disable by
|
|
|
|
// default and enable each host OS variant explicitly. This avoids problems
|
|
|
|
// with implicitly enabled OS variants when the snapshot is used, which might
|
|
|
|
// be different from this run (e.g. different build OS).
|
|
|
|
if ctx.memberType.IsHostOsDependent() {
|
|
|
|
hostSupported := bpModule.getValue("host_supported") == true // Missing means false.
|
|
|
|
if hostSupported {
|
|
|
|
hostPropertySet := targetPropertySet.AddPropertySet("host")
|
|
|
|
hostPropertySet.AddProperty("enabled", false)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-02 11:16:35 +01:00
|
|
|
// Iterate over the os types in a fixed order.
|
|
|
|
for _, osType := range s.getPossibleOsTypes() {
|
|
|
|
osInfo := osTypeToInfo[osType]
|
|
|
|
if osInfo == nil {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2020-03-19 17:11:18 +01:00
|
|
|
osInfo.addToPropertySet(ctx, bpModule, targetPropertySet)
|
2020-02-27 17:00:53 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-02 11:16:35 +01:00
|
|
|
// Compute the list of possible os types that this sdk could support.
|
|
|
|
func (s *sdk) getPossibleOsTypes() []android.OsType {
|
|
|
|
var osTypes []android.OsType
|
2021-04-05 09:33:05 +02:00
|
|
|
for _, osType := range android.OsTypeList() {
|
2020-03-02 11:16:35 +01:00
|
|
|
if s.DeviceSupported() {
|
|
|
|
if osType.Class == android.Device && osType != android.Fuchsia {
|
|
|
|
osTypes = append(osTypes, osType)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if s.HostSupported() {
|
2020-09-14 12:43:17 +02:00
|
|
|
if osType.Class == android.Host {
|
2020-03-02 11:16:35 +01:00
|
|
|
osTypes = append(osTypes, osType)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sort.SliceStable(osTypes, func(i, j int) bool { return osTypes[i].Name < osTypes[j].Name })
|
|
|
|
return osTypes
|
|
|
|
}
|
|
|
|
|
2020-05-04 16:39:59 +02:00
|
|
|
// Given a set of properties (struct value), return the value of the field within that
|
|
|
|
// struct (or one of its embedded structs).
|
2020-03-10 23:50:03 +01:00
|
|
|
type fieldAccessorFunc func(structValue reflect.Value) reflect.Value
|
|
|
|
|
2020-04-30 19:08:29 +02:00
|
|
|
// Checks the metadata to determine whether the property should be ignored for the
|
|
|
|
// purposes of common value extraction or not.
|
|
|
|
type extractorMetadataPredicate func(metadata propertiesContainer) bool
|
|
|
|
|
|
|
|
// Indicates whether optimizable properties are provided by a host variant or
|
|
|
|
// not.
|
|
|
|
type isHostVariant interface {
|
|
|
|
isHostVariant() bool
|
|
|
|
}
|
|
|
|
|
2020-05-04 16:39:59 +02:00
|
|
|
// A property that can be optimized by the commonValueExtractor.
|
|
|
|
type extractorProperty struct {
|
2020-09-15 03:32:35 +02:00
|
|
|
// The name of the field for this property. It is a "."-separated path for
|
|
|
|
// fields in non-anonymous substructs.
|
2020-05-06 13:35:38 +02:00
|
|
|
name string
|
|
|
|
|
2020-04-30 19:08:29 +02:00
|
|
|
// Filter that can use metadata associated with the properties being optimized
|
|
|
|
// to determine whether the field should be ignored during common value
|
|
|
|
// optimization.
|
|
|
|
filter extractorMetadataPredicate
|
|
|
|
|
2020-05-04 16:39:59 +02:00
|
|
|
// Retrieves the value on which common value optimization will be performed.
|
|
|
|
getter fieldAccessorFunc
|
|
|
|
|
|
|
|
// The empty value for the field.
|
|
|
|
emptyValue reflect.Value
|
2020-05-06 11:23:19 +02:00
|
|
|
|
|
|
|
// True if the property can support arch variants false otherwise.
|
|
|
|
archVariant bool
|
2020-05-04 16:39:59 +02:00
|
|
|
}
|
|
|
|
|
2020-05-06 13:35:38 +02:00
|
|
|
func (p extractorProperty) String() string {
|
|
|
|
return p.name
|
|
|
|
}
|
|
|
|
|
2020-03-10 23:50:03 +01:00
|
|
|
// Supports extracting common values from a number of instances of a properties
|
|
|
|
// structure into a separate common set of properties.
|
|
|
|
type commonValueExtractor struct {
|
2020-05-04 16:39:59 +02:00
|
|
|
// The properties that the extractor can optimize.
|
|
|
|
properties []extractorProperty
|
2020-03-10 23:50:03 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Create a new common value extractor for the structure type for the supplied
|
|
|
|
// properties struct.
|
|
|
|
//
|
|
|
|
// The returned extractor can be used on any properties structure of the same type
|
|
|
|
// as the supplied set of properties.
|
|
|
|
func newCommonValueExtractor(propertiesStruct interface{}) *commonValueExtractor {
|
|
|
|
structType := getStructValue(reflect.ValueOf(propertiesStruct)).Type()
|
|
|
|
extractor := &commonValueExtractor{}
|
2020-09-15 03:32:35 +02:00
|
|
|
extractor.gatherFields(structType, nil, "")
|
2020-03-10 23:50:03 +01:00
|
|
|
return extractor
|
|
|
|
}
|
|
|
|
|
|
|
|
// Gather the fields from the supplied structure type from which common values will
|
|
|
|
// be extracted.
|
2020-03-10 23:17:04 +01:00
|
|
|
//
|
2020-09-15 03:32:35 +02:00
|
|
|
// This is recursive function. If it encounters a struct then it will recurse
|
|
|
|
// into it, passing in the accessor for the field and the struct name as prefix
|
|
|
|
// for the nested fields. That will then be used in the accessors for the fields
|
|
|
|
// in the embedded struct.
|
|
|
|
func (e *commonValueExtractor) gatherFields(structType reflect.Type, containingStructAccessor fieldAccessorFunc, namePrefix string) {
|
2020-03-10 23:50:03 +01:00
|
|
|
for f := 0; f < structType.NumField(); f++ {
|
|
|
|
field := structType.Field(f)
|
|
|
|
if field.PkgPath != "" {
|
|
|
|
// Ignore unexported fields.
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2020-03-10 23:17:04 +01:00
|
|
|
// Ignore fields whose value should be kept.
|
|
|
|
if proptools.HasTag(field, "sdk", "keep") {
|
2020-03-10 23:50:03 +01:00
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2020-04-30 19:08:29 +02:00
|
|
|
var filter extractorMetadataPredicate
|
|
|
|
|
|
|
|
// Add a filter
|
|
|
|
if proptools.HasTag(field, "sdk", "ignored-on-host") {
|
|
|
|
filter = func(metadata propertiesContainer) bool {
|
|
|
|
if m, ok := metadata.(isHostVariant); ok {
|
|
|
|
if m.isHostVariant() {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-10 23:50:03 +01:00
|
|
|
// Save a copy of the field index for use in the function.
|
|
|
|
fieldIndex := f
|
2020-05-06 13:35:38 +02:00
|
|
|
|
2020-09-15 03:32:35 +02:00
|
|
|
name := namePrefix + field.Name
|
2020-05-06 13:35:38 +02:00
|
|
|
|
2020-03-10 23:50:03 +01:00
|
|
|
fieldGetter := func(value reflect.Value) reflect.Value {
|
2020-03-10 23:17:04 +01:00
|
|
|
if containingStructAccessor != nil {
|
|
|
|
// This is an embedded structure so first access the field for the embedded
|
|
|
|
// structure.
|
|
|
|
value = containingStructAccessor(value)
|
|
|
|
}
|
|
|
|
|
2020-03-10 23:50:03 +01:00
|
|
|
// Skip through interface and pointer values to find the structure.
|
|
|
|
value = getStructValue(value)
|
|
|
|
|
2020-05-06 13:35:38 +02:00
|
|
|
defer func() {
|
|
|
|
if r := recover(); r != nil {
|
|
|
|
panic(fmt.Errorf("%s for fieldIndex %d of field %s of value %#v", r, fieldIndex, name, value.Interface()))
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
2020-03-10 23:50:03 +01:00
|
|
|
// Return the field.
|
|
|
|
return value.Field(fieldIndex)
|
|
|
|
}
|
|
|
|
|
2020-09-15 03:32:35 +02:00
|
|
|
if field.Type.Kind() == reflect.Struct {
|
|
|
|
// Gather fields from the nested or embedded structure.
|
|
|
|
var subNamePrefix string
|
|
|
|
if field.Anonymous {
|
|
|
|
subNamePrefix = namePrefix
|
|
|
|
} else {
|
|
|
|
subNamePrefix = name + "."
|
|
|
|
}
|
|
|
|
e.gatherFields(field.Type, fieldGetter, subNamePrefix)
|
2020-03-10 23:17:04 +01:00
|
|
|
} else {
|
2020-05-04 16:39:59 +02:00
|
|
|
property := extractorProperty{
|
2020-05-06 13:35:38 +02:00
|
|
|
name,
|
2020-04-30 19:08:29 +02:00
|
|
|
filter,
|
2020-05-04 16:39:59 +02:00
|
|
|
fieldGetter,
|
|
|
|
reflect.Zero(field.Type),
|
2020-05-06 11:23:19 +02:00
|
|
|
proptools.HasTag(field, "android", "arch_variant"),
|
2020-05-04 16:39:59 +02:00
|
|
|
}
|
|
|
|
e.properties = append(e.properties, property)
|
2020-03-10 23:17:04 +01:00
|
|
|
}
|
2020-03-10 23:50:03 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func getStructValue(value reflect.Value) reflect.Value {
|
|
|
|
foundStruct:
|
|
|
|
for {
|
|
|
|
kind := value.Kind()
|
|
|
|
switch kind {
|
|
|
|
case reflect.Interface, reflect.Ptr:
|
|
|
|
value = value.Elem()
|
|
|
|
case reflect.Struct:
|
|
|
|
break foundStruct
|
|
|
|
default:
|
|
|
|
panic(fmt.Errorf("expecting struct, interface or pointer, found %v of kind %s", value, kind))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return value
|
|
|
|
}
|
|
|
|
|
2020-04-30 16:48:31 +02:00
|
|
|
// A container of properties to be optimized.
|
|
|
|
//
|
|
|
|
// Allows additional information to be associated with the properties, e.g. for
|
|
|
|
// filtering.
|
|
|
|
type propertiesContainer interface {
|
2020-05-06 13:35:38 +02:00
|
|
|
fmt.Stringer
|
|
|
|
|
2020-04-30 16:48:31 +02:00
|
|
|
// Get the properties that need optimizing.
|
|
|
|
optimizableProperties() interface{}
|
|
|
|
}
|
|
|
|
|
2021-04-24 12:32:59 +02:00
|
|
|
// A wrapper for sdk variant related properties to allow them to be optimized.
|
|
|
|
type sdkVariantPropertiesContainer struct {
|
|
|
|
sdkVariant *sdk
|
|
|
|
properties interface{}
|
2020-04-30 16:48:31 +02:00
|
|
|
}
|
|
|
|
|
2021-04-24 12:32:59 +02:00
|
|
|
func (c sdkVariantPropertiesContainer) optimizableProperties() interface{} {
|
|
|
|
return c.properties
|
2020-04-30 16:48:31 +02:00
|
|
|
}
|
|
|
|
|
2021-04-24 12:32:59 +02:00
|
|
|
func (c sdkVariantPropertiesContainer) String() string {
|
2020-05-06 13:35:38 +02:00
|
|
|
return c.sdkVariant.String()
|
|
|
|
}
|
|
|
|
|
2020-02-27 17:00:53 +01:00
|
|
|
// Extract common properties from a slice of property structures of the same type.
|
|
|
|
//
|
|
|
|
// All the property structures must be of the same type.
|
|
|
|
// commonProperties - must be a pointer to the structure into which common properties will be added.
|
2020-04-30 16:48:31 +02:00
|
|
|
// inputPropertiesSlice - must be a slice of propertiesContainer interfaces.
|
2020-02-27 17:00:53 +01:00
|
|
|
//
|
|
|
|
// Iterates over each exported field (capitalized name) and checks to see whether they
|
|
|
|
// have the same value (using DeepEquals) across all the input properties. If it does not then no
|
|
|
|
// change is made. Otherwise, the common value is stored in the field in the commonProperties
|
2020-09-15 03:32:35 +02:00
|
|
|
// and the field in each of the input properties structure is set to its default value. Nested
|
|
|
|
// structs are visited recursively and their non-struct fields are compared.
|
2020-05-06 13:35:38 +02:00
|
|
|
func (e *commonValueExtractor) extractCommonProperties(commonProperties interface{}, inputPropertiesSlice interface{}) error {
|
2020-02-27 17:00:53 +01:00
|
|
|
commonPropertiesValue := reflect.ValueOf(commonProperties)
|
|
|
|
commonStructValue := commonPropertiesValue.Elem()
|
|
|
|
|
2020-04-30 16:48:31 +02:00
|
|
|
sliceValue := reflect.ValueOf(inputPropertiesSlice)
|
|
|
|
|
2020-05-04 16:39:59 +02:00
|
|
|
for _, property := range e.properties {
|
|
|
|
fieldGetter := property.getter
|
2020-04-30 19:08:29 +02:00
|
|
|
filter := property.filter
|
|
|
|
if filter == nil {
|
|
|
|
filter = func(metadata propertiesContainer) bool {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
2020-05-04 16:39:59 +02:00
|
|
|
|
2020-02-27 17:00:53 +01:00
|
|
|
// Check to see if all the structures have the same value for the field. The commonValue
|
2020-05-06 11:23:19 +02:00
|
|
|
// is nil on entry to the loop and if it is nil on exit then there is no common value or
|
|
|
|
// all the values have been filtered out, otherwise it points to the common value.
|
2020-02-27 17:00:53 +01:00
|
|
|
var commonValue *reflect.Value
|
|
|
|
|
2020-05-06 11:23:19 +02:00
|
|
|
// Assume that all the values will be the same.
|
|
|
|
//
|
|
|
|
// While similar to this is not quite the same as commonValue == nil. If all the values
|
|
|
|
// have been filtered out then this will be false but commonValue == nil will be true.
|
|
|
|
valuesDiffer := false
|
|
|
|
|
2020-02-27 17:00:53 +01:00
|
|
|
for i := 0; i < sliceValue.Len(); i++ {
|
2020-04-30 16:48:31 +02:00
|
|
|
container := sliceValue.Index(i).Interface().(propertiesContainer)
|
|
|
|
itemValue := reflect.ValueOf(container.optimizableProperties())
|
2020-03-10 23:50:03 +01:00
|
|
|
fieldValue := fieldGetter(itemValue)
|
2020-02-27 17:00:53 +01:00
|
|
|
|
2020-04-30 19:08:29 +02:00
|
|
|
if !filter(container) {
|
|
|
|
expectedValue := property.emptyValue.Interface()
|
|
|
|
actualValue := fieldValue.Interface()
|
|
|
|
if !reflect.DeepEqual(expectedValue, actualValue) {
|
|
|
|
return fmt.Errorf("field %q is supposed to be ignored for %q but is set to %#v instead of %#v", property, container, actualValue, expectedValue)
|
|
|
|
}
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2020-02-27 17:00:53 +01:00
|
|
|
if commonValue == nil {
|
|
|
|
// Use the first value as the commonProperties value.
|
|
|
|
commonValue = &fieldValue
|
|
|
|
} else {
|
|
|
|
// If the value does not match the current common value then there is
|
|
|
|
// no value in common so break out.
|
|
|
|
if !reflect.DeepEqual(fieldValue.Interface(), commonValue.Interface()) {
|
|
|
|
commonValue = nil
|
2020-05-06 11:23:19 +02:00
|
|
|
valuesDiffer = true
|
2020-02-27 17:00:53 +01:00
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-06 11:23:19 +02:00
|
|
|
// If the fields all have common value then store it in the common struct field
|
2020-02-27 17:00:53 +01:00
|
|
|
// and set the input struct's field to the empty value.
|
|
|
|
if commonValue != nil {
|
2020-05-04 16:39:59 +02:00
|
|
|
emptyValue := property.emptyValue
|
2020-03-10 23:50:03 +01:00
|
|
|
fieldGetter(commonStructValue).Set(*commonValue)
|
2020-02-27 17:00:53 +01:00
|
|
|
for i := 0; i < sliceValue.Len(); i++ {
|
2020-04-30 16:48:31 +02:00
|
|
|
container := sliceValue.Index(i).Interface().(propertiesContainer)
|
|
|
|
itemValue := reflect.ValueOf(container.optimizableProperties())
|
2020-03-10 23:50:03 +01:00
|
|
|
fieldValue := fieldGetter(itemValue)
|
2020-02-27 17:00:53 +01:00
|
|
|
fieldValue.Set(emptyValue)
|
|
|
|
}
|
|
|
|
}
|
2020-05-06 11:23:19 +02:00
|
|
|
|
|
|
|
if valuesDiffer && !property.archVariant {
|
|
|
|
// The values differ but the property does not support arch variants so it
|
|
|
|
// is an error.
|
|
|
|
var details strings.Builder
|
|
|
|
for i := 0; i < sliceValue.Len(); i++ {
|
|
|
|
container := sliceValue.Index(i).Interface().(propertiesContainer)
|
|
|
|
itemValue := reflect.ValueOf(container.optimizableProperties())
|
|
|
|
fieldValue := fieldGetter(itemValue)
|
|
|
|
|
|
|
|
_, _ = fmt.Fprintf(&details, "\n %q has value %q", container.String(), fieldValue.Interface())
|
|
|
|
}
|
|
|
|
|
|
|
|
return fmt.Errorf("field %q is not tagged as \"arch_variant\" but has arch specific properties:%s", property.String(), details.String())
|
|
|
|
}
|
2020-02-27 17:00:53 +01:00
|
|
|
}
|
2020-05-06 13:35:38 +02:00
|
|
|
|
|
|
|
return nil
|
2020-02-27 17:00:53 +01:00
|
|
|
}
|