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

Merge "Rename ApexName to ApexVariationName" am: a07777d434 am: be9a9035f2

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

Change-Id: I31f1d4eedbad29ac1562834ea70eb52e0c543ecd
This commit is contained in:
Treehugger Robot
2020-08-15 07:02:47 +00:00
committed by Automerger Merge Worker
parent 2373f49bb7 be9a9035f2
commit 11ff8974eb
9 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/sdk_library.go
View File

@@ -1389,7 +1389,7 @@ func PrebuiltJars(ctx android.BaseModuleContext, baseName string, s sdkSpec) and
// Get the apex name for module, "" if it is for platform.
func getApexNameForModule(module android.Module) string {
if apex, ok := module.(android.ApexModule); ok {
return apex.ApexName()
return apex.ApexVariationName()
}
return ""
@@ -1400,7 +1400,7 @@ func getApexNameForModule(module android.Module) string {
// If either this or the other module are on the platform then this will return
// false.
func withinSameApexAs(module android.ApexModule, other android.Module) bool {
name := module.ApexName()
name := module.ApexVariationName()
return name != "" && getApexNameForModule(other) == name
}
@@ -2093,8 +2093,8 @@ func (module *sdkLibraryXml) ShouldSupportSdkVersion(ctx android.BaseModuleConte
// File path to the runtime implementation library
func (module *sdkLibraryXml) implPath() string {
implName := proptools.String(module.properties.Lib_name)
if apexName := module.ApexName(); apexName != "" {
// TODO(b/146468504): ApexName() is only a soong module name, not apex name.
if apexName := module.ApexVariationName(); apexName != "" {
// 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
// this can be wrong.
return fmt.Sprintf("/apex/%s/javalib/%s.jar", apexName, implName)