Override package name for VNDK APEX
com.android.vndk.v<VER> is overridden with
com.google.android.vndk.v<VERE>.
Test: m com.android.vndk.current
&& aapt2 dump badging ../system/apex/com.android.vndk.current.apex
Change-Id: I623d7a144418d7198f0bbf09c5dc983ed1a631c6
Merged-In: I623d7a144418d7198f0bbf09c5dc983ed1a631c6
(cherry picked from commit 0ed1b1b169
)
This commit is contained in:
@@ -724,7 +724,13 @@ func (a *apexBundle) DepIsInSameApex(ctx android.BaseModuleContext, dep android.
|
||||
}
|
||||
|
||||
func (a *apexBundle) getCertString(ctx android.BaseModuleContext) string {
|
||||
certificate, overridden := ctx.DeviceConfig().OverrideCertificateFor(ctx.ModuleName())
|
||||
moduleName := ctx.ModuleName()
|
||||
// VNDK APEXes share the same certificate. To avoid adding a new VNDK version to the OVERRIDE_* list,
|
||||
// we check with the pseudo module name to see if its certificate is overridden.
|
||||
if a.vndkApex {
|
||||
moduleName = vndkApexName
|
||||
}
|
||||
certificate, overridden := ctx.DeviceConfig().OverrideCertificateFor(moduleName)
|
||||
if overridden {
|
||||
return ":" + certificate
|
||||
}
|
||||
|
Reference in New Issue
Block a user