StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use vendor variant when BOARD_VNDK_VERSION is not set

Browse Source 
Vendor variants are not available when BOARD_VNDK_VERSION is not set.

Test: m for aosp_marlin
Change-Id: I5d89a401f5cf98db3f0a9aa553f00b2d6ee9ed1e
This commit is contained in:
Jiyong Park
2019-01-05 11:15:24 +09:00
parent bf35e33cfb
commit 7c1dc6100a
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apex/apex.go
View File

@@ -374,6 +374,7 @@ func addDependenciesForNativeModules(ctx android.BottomUpMutatorContext,
func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) { func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) {
targets := ctx.MultiTargets() targets := ctx.MultiTargets()
config := ctx.DeviceConfig()
has32BitTarget := false has32BitTarget := false
for _, target := range targets { for _, target := range targets {
if target.Arch.ArchType.Multilib == "lib32" { if target.Arch.ArchType.Multilib == "lib32" {
@@ -385,7 +386,7 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) {
// multilib.both. // multilib.both.
ctx.AddFarVariationDependencies([]blueprint.Variation{ ctx.AddFarVariationDependencies([]blueprint.Variation{
{Mutator: "arch", Variation: target.String()}, {Mutator: "arch", Variation: target.String()},
{Mutator: "image", Variation: a.getImageVariation()}, {Mutator: "image", Variation: a.getImageVariation(config)},
{Mutator: "link", Variation: "shared"}, {Mutator: "link", Variation: "shared"},
}, sharedLibTag, a.properties.Native_shared_libs...) }, sharedLibTag, a.properties.Native_shared_libs...)
@@ -393,21 +394,21 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) {
addDependenciesForNativeModules(ctx, addDependenciesForNativeModules(ctx,
a.properties.Multilib.Both.Native_shared_libs, a.properties.Multilib.Both.Native_shared_libs,
a.properties.Multilib.Both.Binaries, target.String(), a.properties.Multilib.Both.Binaries, target.String(),
a.getImageVariation()) a.getImageVariation(config))
if i == 0 { if i == 0 {
// When multilib.* is omitted for binaries, it implies // When multilib.* is omitted for binaries, it implies
// multilib.first. // multilib.first.
ctx.AddFarVariationDependencies([]blueprint.Variation{ ctx.AddFarVariationDependencies([]blueprint.Variation{
{Mutator: "arch", Variation: target.String()}, {Mutator: "arch", Variation: target.String()},
{Mutator: "image", Variation: a.getImageVariation()}, {Mutator: "image", Variation: a.getImageVariation(config)},
}, executableTag, a.properties.Binaries...) }, executableTag, a.properties.Binaries...)
// Add native modules targetting the first ABI // Add native modules targetting the first ABI
addDependenciesForNativeModules(ctx, addDependenciesForNativeModules(ctx,
a.properties.Multilib.First.Native_shared_libs, a.properties.Multilib.First.Native_shared_libs,
a.properties.Multilib.First.Binaries, target.String(), a.properties.Multilib.First.Binaries, target.String(),
a.getImageVariation()) a.getImageVariation(config))
} }
switch target.Arch.ArchType.Multilib { switch target.Arch.ArchType.Multilib {
@@ -416,24 +417,24 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) {
addDependenciesForNativeModules(ctx, addDependenciesForNativeModules(ctx,
a.properties.Multilib.Lib32.Native_shared_libs, a.properties.Multilib.Lib32.Native_shared_libs,
a.properties.Multilib.Lib32.Binaries, target.String(), a.properties.Multilib.Lib32.Binaries, target.String(),
a.getImageVariation()) a.getImageVariation(config))
addDependenciesForNativeModules(ctx, addDependenciesForNativeModules(ctx,
a.properties.Multilib.Prefer32.Native_shared_libs, a.properties.Multilib.Prefer32.Native_shared_libs,
a.properties.Multilib.Prefer32.Binaries, target.String(), a.properties.Multilib.Prefer32.Binaries, target.String(),
a.getImageVariation()) a.getImageVariation(config))
case "lib64": case "lib64":
// Add native modules targetting 64-bit ABI // Add native modules targetting 64-bit ABI
addDependenciesForNativeModules(ctx, addDependenciesForNativeModules(ctx,
a.properties.Multilib.Lib64.Native_shared_libs, a.properties.Multilib.Lib64.Native_shared_libs,
a.properties.Multilib.Lib64.Binaries, target.String(), a.properties.Multilib.Lib64.Binaries, target.String(),
a.getImageVariation()) a.getImageVariation(config))
if !has32BitTarget { if !has32BitTarget {
addDependenciesForNativeModules(ctx, addDependenciesForNativeModules(ctx,
a.properties.Multilib.Prefer32.Native_shared_libs, a.properties.Multilib.Prefer32.Native_shared_libs,
a.properties.Multilib.Prefer32.Binaries, target.String(), a.properties.Multilib.Prefer32.Binaries, target.String(),
a.getImageVariation()) a.getImageVariation(config))
} }
} }
@@ -471,8 +472,8 @@ func (a *apexBundle) installable() bool {
return a.properties.Installable == nil || proptools.Bool(a.properties.Installable) return a.properties.Installable == nil || proptools.Bool(a.properties.Installable)
} }
func (a *apexBundle) getImageVariation() string { func (a *apexBundle) getImageVariation(config android.DeviceConfig) string {
if proptools.Bool(a.properties.Use_vendor) { if config.VndkVersion() != "" && proptools.Bool(a.properties.Use_vendor) {
return "vendor" return "vendor"
} else { } else {
return "core" return "core"