Add data_bins property
data_bins is similar to data_libs but copies helper binaries alongside the test. Bug: 200872604 Test: atest CtsBionicTestCases Change-Id: I4f9df5f82816cfd30a0a19808fda220cf77c50a7
This commit is contained in:
4
cc/cc.go
4
cc/cc.go
@@ -95,6 +95,7 @@ type Deps struct {
|
||||
|
||||
// Used for data dependencies adjacent to tests
|
||||
DataLibs []string
|
||||
DataBins []string
|
||||
|
||||
// Used by DepsMutator to pass system_shared_libs information to check_elf_file.py.
|
||||
SystemSharedLibs []string
|
||||
@@ -718,6 +719,7 @@ var (
|
||||
staticVariantTag = dependencyTag{name: "static variant"}
|
||||
vndkExtDepTag = dependencyTag{name: "vndk extends"}
|
||||
dataLibDepTag = dependencyTag{name: "data lib"}
|
||||
dataBinDepTag = dependencyTag{name: "data bin"}
|
||||
runtimeDepTag = installDependencyTag{name: "runtime lib"}
|
||||
testPerSrcDepTag = dependencyTag{name: "test_per_src"}
|
||||
stubImplDepTag = dependencyTag{name: "stub_impl"}
|
||||
@@ -2274,6 +2276,8 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) {
|
||||
{Mutator: "link", Variation: "shared"},
|
||||
}, dataLibDepTag, deps.DataLibs...)
|
||||
|
||||
actx.AddVariationDependencies(nil, dataBinDepTag, deps.DataBins...)
|
||||
|
||||
actx.AddVariationDependencies([]blueprint.Variation{
|
||||
{Mutator: "link", Variation: "shared"},
|
||||
}, runtimeDepTag, deps.RuntimeLibs...)
|
||||
|
Reference in New Issue
Block a user