a04c107bfa
Updates the member snapshot creation code to support multiple os types. It basically sorts the variants by os type, then applies the code to optimize the arch properties and then it optimizes the properties that are common across architectures and extracts any properties that are common across os types. The java and cc member types needed to be modified to make the location of the generated files within the snapshot os type dependent when there is more than one os type. That was done by adding an OsPrefix() method to the SdkMemberPropertiesBase which returns the os prefix to use when there is > 1 os type and otherwise returns an empty string. Added three tests, one for cc shared libraries, one for cc binary and one for java header libraries. Bug: 150451422 Test: m nothing Change-Id: I08f5fbdd7852b06c9a9a2f1cfdc364338a3d5bac
117 lines
3.6 KiB
Go
117 lines
3.6 KiB
Go
// Copyright 2020 Google Inc. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package cc
|
|
|
|
import (
|
|
"path/filepath"
|
|
|
|
"android/soong/android"
|
|
"github.com/google/blueprint"
|
|
)
|
|
|
|
func init() {
|
|
android.RegisterSdkMemberType(ccBinarySdkMemberType)
|
|
}
|
|
|
|
var ccBinarySdkMemberType = &binarySdkMemberType{
|
|
SdkMemberTypeBase: android.SdkMemberTypeBase{
|
|
PropertyName: "native_binaries",
|
|
},
|
|
}
|
|
|
|
type binarySdkMemberType struct {
|
|
android.SdkMemberTypeBase
|
|
}
|
|
|
|
func (mt *binarySdkMemberType) AddDependencies(mctx android.BottomUpMutatorContext, dependencyTag blueprint.DependencyTag, names []string) {
|
|
targets := mctx.MultiTargets()
|
|
for _, lib := range names {
|
|
for _, target := range targets {
|
|
name, version := StubsLibNameAndVersion(lib)
|
|
if version == "" {
|
|
version = LatestStubsVersionFor(mctx.Config(), name)
|
|
}
|
|
mctx.AddFarVariationDependencies(append(target.Variations(), []blueprint.Variation{
|
|
{Mutator: "version", Variation: version},
|
|
}...), dependencyTag, name)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (mt *binarySdkMemberType) IsInstance(module android.Module) bool {
|
|
// Check the module to see if it can be used with this module type.
|
|
if m, ok := module.(*Module); ok {
|
|
for _, allowableMemberType := range m.sdkMemberTypes {
|
|
if allowableMemberType == mt {
|
|
return true
|
|
}
|
|
}
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
func (mt *binarySdkMemberType) AddPrebuiltModule(sdkModuleContext android.ModuleContext, builder android.SnapshotBuilder, member android.SdkMember) android.BpModule {
|
|
pbm := builder.AddPrebuiltModule(member, "cc_prebuilt_binary")
|
|
return pbm
|
|
}
|
|
|
|
func (mt *binarySdkMemberType) CreateVariantPropertiesStruct() android.SdkMemberProperties {
|
|
return &nativeBinaryInfoProperties{}
|
|
}
|
|
|
|
const (
|
|
nativeBinaryDir = "bin"
|
|
)
|
|
|
|
// path to the native binary. Relative to <sdk_root>/<api_dir>
|
|
func nativeBinaryPathFor(lib nativeBinaryInfoProperties) string {
|
|
return filepath.Join(lib.OsPrefix(), lib.archType,
|
|
nativeBinaryDir, lib.outputFile.Base())
|
|
}
|
|
|
|
// nativeBinaryInfoProperties represents properties of a native binary
|
|
//
|
|
// The exported (capitalized) fields will be examined and may be changed during common value extraction.
|
|
// The unexported fields will be left untouched.
|
|
type nativeBinaryInfoProperties struct {
|
|
android.SdkMemberPropertiesBase
|
|
|
|
// archType is not exported as if set (to a non default value) it is always arch specific.
|
|
// This is "" for common properties.
|
|
archType string
|
|
|
|
// outputFile is not exported as it is always arch specific.
|
|
outputFile android.Path
|
|
}
|
|
|
|
func (p *nativeBinaryInfoProperties) PopulateFromVariant(variant android.SdkAware) {
|
|
ccModule := variant.(*Module)
|
|
|
|
p.archType = ccModule.Target().Arch.ArchType.String()
|
|
p.outputFile = ccModule.OutputFile().Path()
|
|
}
|
|
|
|
func (p *nativeBinaryInfoProperties) AddToPropertySet(sdkModuleContext android.ModuleContext, builder android.SnapshotBuilder, propertySet android.BpPropertySet) {
|
|
if p.Compile_multilib != "" {
|
|
propertySet.AddProperty("compile_multilib", p.Compile_multilib)
|
|
}
|
|
|
|
if p.outputFile != nil {
|
|
propertySet.AddProperty("srcs", []string{nativeBinaryPathFor(*p)})
|
|
|
|
builder.CopyToSnapshot(p.outputFile, nativeBinaryPathFor(*p))
|
|
}
|
|
}
|