Add use_vendor to APEX module
use_vendor, when set to true, brings vendor variant of the native
libraries and binaries to the APEX.
Bug: 115707625
Test: m (apex_test updated)
Change-Id: Ib4e996f8652f4ce4645a9c22f6914e2ab35edda6
diff --git a/apex/apex.go b/apex/apex.go
index c714771..6230236 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -214,6 +214,10 @@
// Whether this APEX is installable to one of the partitions. Default: true.
Installable *bool
+ // For native libraries and binaries, use the vendor variant instead of the core (platform) variant.
+ // Default is false.
+ Use_vendor *bool
+
Multilib struct {
First struct {
// List of native libraries whose compile_multilib is "first"
@@ -350,21 +354,21 @@
}
func addDependenciesForNativeModules(ctx android.BottomUpMutatorContext,
- native_shared_libs []string, binaries []string, arch string) {
+ native_shared_libs []string, binaries []string, arch string, imageVariation string) {
// Use *FarVariation* to be able to depend on modules having
// conflicting variations with this module. This is required since
// arch variant of an APEX bundle is 'common' but it is 'arm' or 'arm64'
// for native shared libs.
ctx.AddFarVariationDependencies([]blueprint.Variation{
{Mutator: "arch", Variation: arch},
- {Mutator: "image", Variation: "core"},
+ {Mutator: "image", Variation: imageVariation},
{Mutator: "link", Variation: "shared"},
{Mutator: "version", Variation: ""}, // "" is the non-stub variant
}, sharedLibTag, native_shared_libs...)
ctx.AddFarVariationDependencies([]blueprint.Variation{
{Mutator: "arch", Variation: arch},
- {Mutator: "image", Variation: "core"},
+ {Mutator: "image", Variation: imageVariation},
}, executableTag, binaries...)
}
@@ -381,27 +385,29 @@
// multilib.both.
ctx.AddFarVariationDependencies([]blueprint.Variation{
{Mutator: "arch", Variation: target.String()},
- {Mutator: "image", Variation: "core"},
+ {Mutator: "image", Variation: a.getImageVariation()},
{Mutator: "link", Variation: "shared"},
}, sharedLibTag, a.properties.Native_shared_libs...)
// Add native modules targetting both ABIs
addDependenciesForNativeModules(ctx,
a.properties.Multilib.Both.Native_shared_libs,
- a.properties.Multilib.Both.Binaries, target.String())
+ a.properties.Multilib.Both.Binaries, target.String(),
+ a.getImageVariation())
if i == 0 {
// When multilib.* is omitted for binaries, it implies
// multilib.first.
ctx.AddFarVariationDependencies([]blueprint.Variation{
{Mutator: "arch", Variation: target.String()},
- {Mutator: "image", Variation: "core"},
+ {Mutator: "image", Variation: a.getImageVariation()},
}, executableTag, a.properties.Binaries...)
// Add native modules targetting the first ABI
addDependenciesForNativeModules(ctx,
a.properties.Multilib.First.Native_shared_libs,
- a.properties.Multilib.First.Binaries, target.String())
+ a.properties.Multilib.First.Binaries, target.String(),
+ a.getImageVariation())
}
switch target.Arch.ArchType.Multilib {
@@ -409,21 +415,25 @@
// Add native modules targetting 32-bit ABI
addDependenciesForNativeModules(ctx,
a.properties.Multilib.Lib32.Native_shared_libs,
- a.properties.Multilib.Lib32.Binaries, target.String())
+ a.properties.Multilib.Lib32.Binaries, target.String(),
+ a.getImageVariation())
addDependenciesForNativeModules(ctx,
a.properties.Multilib.Prefer32.Native_shared_libs,
- a.properties.Multilib.Prefer32.Binaries, target.String())
+ a.properties.Multilib.Prefer32.Binaries, target.String(),
+ a.getImageVariation())
case "lib64":
// Add native modules targetting 64-bit ABI
addDependenciesForNativeModules(ctx,
a.properties.Multilib.Lib64.Native_shared_libs,
- a.properties.Multilib.Lib64.Binaries, target.String())
+ a.properties.Multilib.Lib64.Binaries, target.String(),
+ a.getImageVariation())
if !has32BitTarget {
addDependenciesForNativeModules(ctx,
a.properties.Multilib.Prefer32.Native_shared_libs,
- a.properties.Multilib.Prefer32.Binaries, target.String())
+ a.properties.Multilib.Prefer32.Binaries, target.String(),
+ a.getImageVariation())
}
}
@@ -461,6 +471,14 @@
return a.properties.Installable == nil || proptools.Bool(a.properties.Installable)
}
+func (a *apexBundle) getImageVariation() string {
+ if proptools.Bool(a.properties.Use_vendor) {
+ return "vendor"
+ } else {
+ return "core"
+ }
+}
+
func getCopyManifestForNativeLibrary(cc *cc.Module) (fileToCopy android.Path, dirInApex string) {
// Decide the APEX-local directory by the multilib of the library
// In the future, we may query this to the module.