From 4e765b1bfc82703d9febf30b44d3f6cbcaa29523 Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Thu, 4 Apr 2024 17:33:42 +0900 Subject: Remove Device VNDK version usage from Soong As of VNDK deprecation, Device VNDK version should no longer be used from build. This change removes all references on Device VNDK version and related logic with it. Bug: 330100430 Test: AOSP CF build succeeded Change-Id: Ibc290f0b41e8321f80c75c69f810223989af68dc --- apex/builder.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apex/builder.go') diff --git a/apex/builder.go b/apex/builder.go index 9bd4b61da..763ce4d20 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -293,7 +293,7 @@ func (a *apexBundle) buildManifest(ctx android.ModuleContext, provideNativeLibs, } if android.InList(":vndk", requireNativeLibs) { - if _, vndkVersion := a.getImageVariationPair(ctx.DeviceConfig()); vndkVersion != "" { + if _, vndkVersion := a.getImageVariationPair(); vndkVersion != "" { optCommands = append(optCommands, "-v vndkVersion "+vndkVersion) } } -- cgit v1.2.3-59-g8ed1b