diff options
| author | 2020-08-13 11:24:56 -0700 | |
|---|---|---|
| committer | 2020-08-13 17:50:29 -0700 | |
| commit | e07f2316b7a5d5ee82a33caf814fd24077c372f8 (patch) | |
| tree | d35660fe51f1d8c2f34681e69ff100fc723b775e /java/sdk_library.go | |
| parent | 1b9604b463f62abd42f404ee1e06ac878a75427c (diff) | |
Rename ApexName to ApexVariationName
In preparation for reusing the same variation for multiple apexes,
rename ApexName to ApexVariationName.
Bug: 164216768
Test: all soong tests
Change-Id: I88f2c5b192ffa27acd38e01952d0cefd413222a0
Diffstat (limited to 'java/sdk_library.go')
| -rw-r--r-- | java/sdk_library.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index 25f0134aa..2aae42fc9 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -1379,7 +1379,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 "" @@ -1390,7 +1390,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 } @@ -2083,8 +2083,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) |