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

Merge "APEXes contain VNDK libraries when VNDK is deprecated" into main am: f97a42e5f2 am: 502be69c12 am: 66eeebf02a am: a5704fdc2f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2676779

Change-Id: Ia41e8381baa1bd4df5be606acf2d655fa8a082ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kiyoung Kim
2023-07-27 04:40:59 +00:00
committed by Automerger Merge Worker
parent cfefa3cbd2 a5704fdc2f
commit df794a5f0b
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apex/apex.go
View File

@@ -993,7 +993,7 @@ func (a *apexBundle) ApexInfoMutator(mctx android.TopDownMutatorContext) {
// the non-system APEXes because the VNDK libraries won't be included (and duped) in the
// APEX, but shared across APEXes via the VNDK APEX.
useVndk := a.SocSpecific() || a.DeviceSpecific() || (a.ProductSpecific() && mctx.Config().EnforceProductPartitionInterface())
excludeVndkLibs := useVndk && proptools.Bool(a.properties.Use_vndk_as_stable)
excludeVndkLibs := useVndk && a.useVndkAsStable(mctx)
if proptools.Bool(a.properties.Use_vndk_as_stable) {
if !useVndk {
mctx.PropertyErrorf("use_vndk_as_stable", "not supported for system/system_ext APEXes")
@@ -2394,7 +2394,7 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext,
// tags used below are private (e.g. `cc.sharedDepTag`).
if cc.IsSharedDepTag(depTag) || cc.IsRuntimeDepTag(depTag) {
if ch, ok := child.(*cc.Module); ok {
if ch.UseVndk() && proptools.Bool(a.properties.Use_vndk_as_stable) && ch.IsVndk() {
if ch.UseVndk() && a.useVndkAsStable(ctx) && ch.IsVndk() {
vctx.requireNativeLibs = append(vctx.requireNativeLibs, ":vndk")
return false
}
@@ -3716,3 +3716,12 @@ func invalidCompileMultilib(ctx android.TopDownMutatorContext, value string) {
func (a *apexBundle) IsTestApex() bool {
return a.testApex
}
func (a *apexBundle) useVndkAsStable(ctx android.BaseModuleContext) bool {
// VNDK cannot be linked if it is deprecated
if ctx.Config().IsVndkDeprecated() {
return false
}
return proptools.Bool(a.properties.Use_vndk_as_stable)
}

6
apex/apex_test.go
View File

@@ -3029,7 +3029,11 @@ func TestVendorApex_use_vndk_as_stable(t *testing.T) {
vendor: true,
shared_libs: ["libvndk", "libvendor"],
}
`)
`,
android.FixtureModifyConfig(func(config android.Config) {
config.TestProductVariables.KeepVndk = proptools.BoolPtr(true)
}),
)
vendorVariant := "android_vendor.29_arm64_armv8-a"