From 69f4218c4feaeca953237cd9e76a9a8cc423d3e3 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Wed, 29 Mar 2023 16:25:16 +0000 Subject: [PATCH] Rename JavaLibraryNameFromText function 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 --- android/sdk_version.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/sdk_version.go b/android/sdk_version.go index 5bb1e5a2c..1f01dc64f 100644 --- a/android/sdk_version.go +++ b/android/sdk_version.go @@ -87,13 +87,13 @@ func (k SdkKind) String() string { // JavaLibraryName returns the soong module containing the Java APIs of that API surface. func (k SdkKind) JavaLibraryName(c Config) string { 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. // 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() { return name + ".from-text" }