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

Rename vndk apex according to vndk version

Browse Source 
VNDK APEX should be named after the version of VNDK libs.
For example, if vndk_version is 29, then the apex name should be
com.android.vndk.v29. If vndk_version is not set or is 'current', then
the platform vndk version is implied.

This is done with setting "apex_name" with proper name.

Bug: 139774701
Test: m (soong test added)
Change-Id: I918252f12ccd351886030fe9139a020d6cf1ff32
This commit is contained in:
Jooyung Han
2019-10-01 20:02:42 +09:00
parent fd3688c449
commit 90eee02a9a
2 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apex/apex.go
View File

@@ -222,12 +222,14 @@ func apexVndkGatherMutator(mctx android.TopDownMutatorContext) {
if ab.IsNativeBridgeSupported() {
mctx.PropertyErrorf("native_bridge_supported", "%q doesn't support native bridge binary.", mctx.ModuleType())
}
vndkVersion := proptools.StringDefault(ab.vndkProperties.Vndk_version, mctx.DeviceConfig().PlatformVndkVersion())
vndkVersion := proptools.String(ab.vndkProperties.Vndk_version)
vndkApexListMutex.Lock()
defer vndkApexListMutex.Unlock()
vndkApexList := vndkApexList(mctx.Config())
if other, ok := vndkApexList[vndkVersion]; ok {
mctx.PropertyErrorf("vndk_version", "%v is already defined in %q", vndkVersion, other.Name())
mctx.PropertyErrorf("vndk_version", "%v is already defined in %q", vndkVersion, other.BaseModuleName())
}
vndkApexList[vndkVersion] = ab
}
@@ -1791,6 +1793,15 @@ func vndkApexBundleFactory() android.Module {
}{
proptools.StringPtr("both"),
})
vndkVersion := proptools.StringDefault(bundle.vndkProperties.Vndk_version, "current")
if vndkVersion == "current" {
vndkVersion = ctx.DeviceConfig().PlatformVndkVersion()
bundle.vndkProperties.Vndk_version = proptools.StringPtr(vndkVersion)
}
// Ensure VNDK APEX mount point is formatted as com.android.vndk.v###
bundle.properties.Apex_name = proptools.StringPtr("com.android.vndk.v" + vndkVersion)
})
return bundle
}