Merge "Use BaseApexName to generate permission file for sdk library" into main
This commit is contained in:
@@ -84,6 +84,9 @@ type ApexInfo struct {
|
|||||||
|
|
||||||
// Returns the name of the test apexes that this module is included in.
|
// Returns the name of the test apexes that this module is included in.
|
||||||
TestApexes []string
|
TestApexes []string
|
||||||
|
|
||||||
|
// Returns the name of the overridden apex (com.android.foo)
|
||||||
|
BaseApexName string
|
||||||
}
|
}
|
||||||
|
|
||||||
// AllApexInfo holds the ApexInfo of all apexes that include this module.
|
// AllApexInfo holds the ApexInfo of all apexes that include this module.
|
||||||
|
@@ -1043,6 +1043,7 @@ func (a *apexBundle) ApexInfoMutator(mctx android.TopDownMutatorContext) {
|
|||||||
InApexModules: []string{a.Name()}, // could be com.mycompany.android.foo
|
InApexModules: []string{a.Name()}, // could be com.mycompany.android.foo
|
||||||
ApexContents: []*android.ApexContents{apexContents},
|
ApexContents: []*android.ApexContents{apexContents},
|
||||||
TestApexes: testApexes,
|
TestApexes: testApexes,
|
||||||
|
BaseApexName: mctx.ModuleName(),
|
||||||
}
|
}
|
||||||
mctx.WalkDeps(func(child, parent android.Module) bool {
|
mctx.WalkDeps(func(child, parent android.Module) bool {
|
||||||
if !continueApexDepsWalk(child, parent) {
|
if !continueApexDepsWalk(child, parent) {
|
||||||
|
@@ -3279,7 +3279,7 @@ func (module *sdkLibraryXml) implPath(ctx android.ModuleContext) string {
|
|||||||
// TODO(b/146468504): ApexVariationName() is only a soong module name, not apex name.
|
// TODO(b/146468504): ApexVariationName() is only a soong module name, not apex name.
|
||||||
// In most cases, this works fine. But when apex_name is set or override_apex is used
|
// In most cases, this works fine. But when apex_name is set or override_apex is used
|
||||||
// this can be wrong.
|
// this can be wrong.
|
||||||
return fmt.Sprintf("/apex/%s/javalib/%s.jar", apexInfo.ApexVariationName, implName)
|
return fmt.Sprintf("/apex/%s/javalib/%s.jar", apexInfo.BaseApexName, implName)
|
||||||
}
|
}
|
||||||
partition := "system"
|
partition := "system"
|
||||||
if module.SocSpecific() {
|
if module.SocSpecific() {
|
||||||
|
Reference in New Issue
Block a user