65b6224471
Previously, the dep tag used by PackagingBase was fixed, which prevented some of its clients (e.g. cvd-host-package) from opting in to android.InstallAlwaysNeededDependencyTag. Now, PackagingBase.AddDeps accepts the dependency tag to use. Also, dependencies toward rust dylib, rlib, and proc_macro are configured to return true on InstallDepNeeded. This is required to install shared_lib dependencies of the rust modules when they are depended on by a rust binary. Exempt-From-Owner-Approval: a trivial change after +2 from the owner. This has to land ASAP as many users are affected by acloud being unavailable. Bug: N/A Test: m Test: acloud create --local-instance --local-image Change-Id: If22aee7c6f314fcb03b9d4fe6901a2557f1e899c
190 lines
4 KiB
Go
190 lines
4 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 android
|
|
|
|
import (
|
|
"reflect"
|
|
"testing"
|
|
|
|
"github.com/google/blueprint"
|
|
)
|
|
|
|
// Module to be packaged
|
|
type componentTestModule struct {
|
|
ModuleBase
|
|
props struct {
|
|
Deps []string
|
|
}
|
|
}
|
|
|
|
func componentTestModuleFactory() Module {
|
|
m := &componentTestModule{}
|
|
m.AddProperties(&m.props)
|
|
InitAndroidArchModule(m, HostAndDeviceSupported, MultilibBoth)
|
|
return m
|
|
}
|
|
|
|
func (m *componentTestModule) DepsMutator(ctx BottomUpMutatorContext) {
|
|
ctx.AddDependency(ctx.Module(), nil, m.props.Deps...)
|
|
}
|
|
|
|
func (m *componentTestModule) GenerateAndroidBuildActions(ctx ModuleContext) {
|
|
builtFile := PathForModuleOut(ctx, m.Name())
|
|
dir := ctx.Target().Arch.ArchType.Multilib
|
|
installDir := PathForModuleInstall(ctx, dir)
|
|
ctx.InstallFile(installDir, m.Name(), builtFile)
|
|
}
|
|
|
|
// Module that itself is a package
|
|
type packageTestModule struct {
|
|
ModuleBase
|
|
PackagingBase
|
|
|
|
entries []string
|
|
}
|
|
|
|
func packageTestModuleFactory() Module {
|
|
module := &packageTestModule{}
|
|
InitPackageModule(module)
|
|
InitAndroidMultiTargetsArchModule(module, DeviceSupported, MultilibCommon)
|
|
return module
|
|
}
|
|
|
|
func (m *packageTestModule) DepsMutator(ctx BottomUpMutatorContext) {
|
|
m.AddDeps(ctx, struct{ blueprint.BaseDependencyTag }{})
|
|
}
|
|
|
|
func (m *packageTestModule) GenerateAndroidBuildActions(ctx ModuleContext) {
|
|
zipFile := PathForModuleOut(ctx, "myzip.zip").OutputPath
|
|
m.entries = m.CopyDepsToZip(ctx, zipFile)
|
|
}
|
|
|
|
func runPackagingTest(t *testing.T, bp string, expected []string) {
|
|
t.Helper()
|
|
|
|
config := TestArchConfig(buildDir, nil, bp, nil)
|
|
|
|
ctx := NewTestArchContext(config)
|
|
ctx.RegisterModuleType("component", componentTestModuleFactory)
|
|
ctx.RegisterModuleType("package_module", packageTestModuleFactory)
|
|
ctx.Register()
|
|
|
|
_, errs := ctx.ParseFileList(".", []string{"Android.bp"})
|
|
FailIfErrored(t, errs)
|
|
_, errs = ctx.PrepareBuildActions(config)
|
|
FailIfErrored(t, errs)
|
|
|
|
p := ctx.ModuleForTests("package", "android_common").Module().(*packageTestModule)
|
|
actual := p.entries
|
|
actual = SortedUniqueStrings(actual)
|
|
expected = SortedUniqueStrings(expected)
|
|
if !reflect.DeepEqual(actual, expected) {
|
|
t.Errorf("\ngot: %v\nexpected: %v\n", actual, expected)
|
|
}
|
|
}
|
|
|
|
func TestPackagingBase(t *testing.T) {
|
|
runPackagingTest(t,
|
|
`
|
|
component {
|
|
name: "foo",
|
|
}
|
|
|
|
package_module {
|
|
name: "package",
|
|
deps: ["foo"],
|
|
}
|
|
`, []string{"lib64/foo"})
|
|
|
|
runPackagingTest(t,
|
|
`
|
|
component {
|
|
name: "foo",
|
|
deps: ["bar"],
|
|
}
|
|
|
|
component {
|
|
name: "bar",
|
|
}
|
|
|
|
package_module {
|
|
name: "package",
|
|
deps: ["foo"],
|
|
}
|
|
`, []string{"lib64/foo", "lib64/bar"})
|
|
|
|
runPackagingTest(t,
|
|
`
|
|
component {
|
|
name: "foo",
|
|
deps: ["bar"],
|
|
}
|
|
|
|
component {
|
|
name: "bar",
|
|
}
|
|
|
|
package_module {
|
|
name: "package",
|
|
deps: ["foo"],
|
|
compile_multilib: "both",
|
|
}
|
|
`, []string{"lib32/foo", "lib32/bar", "lib64/foo", "lib64/bar"})
|
|
|
|
runPackagingTest(t,
|
|
`
|
|
component {
|
|
name: "foo",
|
|
}
|
|
|
|
component {
|
|
name: "bar",
|
|
compile_multilib: "32",
|
|
}
|
|
|
|
package_module {
|
|
name: "package",
|
|
deps: ["foo"],
|
|
multilib: {
|
|
lib32: {
|
|
deps: ["bar"],
|
|
},
|
|
},
|
|
compile_multilib: "both",
|
|
}
|
|
`, []string{"lib32/foo", "lib32/bar", "lib64/foo"})
|
|
|
|
runPackagingTest(t,
|
|
`
|
|
component {
|
|
name: "foo",
|
|
}
|
|
|
|
component {
|
|
name: "bar",
|
|
}
|
|
|
|
package_module {
|
|
name: "package",
|
|
deps: ["foo"],
|
|
multilib: {
|
|
first: {
|
|
deps: ["bar"],
|
|
},
|
|
},
|
|
compile_multilib: "both",
|
|
}
|
|
`, []string{"lib32/foo", "lib64/foo", "lib64/bar"})
|
|
}
|