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

Rename JavaLibraryNameFromText function

Browse Source 
The "FromText" suffix is an implementation detail. Having this suffix in
the name can be also confusing because in certain settings (e.g. when
not run with --build-stub-from-text) it returns the name of the stub
module generated from source files

Test: go build ./java
Change-Id: I68678ddfaa3d68c8e1a945632e7512b5de33d9af
This commit is contained in:
Spandan Das
2023-03-29 16:25:16 +00:00
parent bc2906efef
commit 69f4218c4f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/sdk_version.go
View File

@@ -87,13 +87,13 @@ func (k SdkKind) String() string {
// JavaLibraryName returns the soong module containing the Java APIs of that API surface. // JavaLibraryName returns the soong module containing the Java APIs of that API surface.
func (k SdkKind) JavaLibraryName(c Config) string { func (k SdkKind) JavaLibraryName(c Config) string {
name := k.defaultJavaLibraryName() name := k.defaultJavaLibraryName()
return JavaLibraryNameFromText(c, name) return JavaApiLibraryName(c, name)
} }
// JavaLibraryNameFromText returns the name of .txt equivalent of a java_library, but does // JavaApiLibraryName returns the name of .txt equivalent of a java_library, but does
// not check if either module exists. // not check if either module exists.
// TODO: Return .txt (single-tree or multi-tree equivalents) based on config // TODO: Return .txt (single-tree or multi-tree equivalents) based on config
func JavaLibraryNameFromText(c Config, name string) string { func JavaApiLibraryName(c Config, name string) string {
if c.BuildFromTextStub() { if c.BuildFromTextStub() {
return name + ".from-text" return name + ".from-text"
} }