Merge changes I1ed3ab24,I68678ddf am: 2d704998f4 am: 9b9cda6b14

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

Change-Id: I15a0015fa6465708436254fde8efa6ed05446359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files 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"
 	}