summaryrefslogtreecommitdiff
path: root/android/sdk_version.go
diff options
context:
space:
mode:
author Jihoon Kang <jihoonkang@google.com> 2023-06-14 22:43:25 +0000
committer Jihoon Kang <jihoonkang@google.com> 2023-06-15 19:42:34 +0000
commit6c0df888094915e32955c2b175b29c020104d07c (patch)
tree7479b740ef66cfaa03a2b0afed73932ab757ee13 /android/sdk_version.go
parent3d4d88d68e5b5796cf4d9d236793df5322a1eab5 (diff)
Cleanup remaining android.JavaApiLibraryName() references
Since the name of the java_library generated from sdk_library per api scope does not depend on the build configuration anymore, all dependency switching "magic" via android.JavaApiLibraryName() can be removed. This change also removes from-text-build-specific test cases, as those test cases depend on build configurations. Test: m nothing && m nothing --build-from-text-stub Bug: 287340610 Change-Id: I3bac35259e0cbaa16432a46cb2b128951c9bc075
Diffstat (limited to 'android/sdk_version.go')
-rw-r--r--android/sdk_version.go19
1 files changed, 0 insertions, 19 deletions
diff --git a/android/sdk_version.go b/android/sdk_version.go
index 80aeb2e69..1fadda0ca 100644
--- a/android/sdk_version.go
+++ b/android/sdk_version.go
@@ -84,25 +84,6 @@ func (k SdkKind) String() string {
}
}
-// 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 JavaApiLibraryName(c Config, name string) string {
- if c.BuildFromTextStub() {
- return name + ".from-text"
- }
- return name
-}
-
-// JavaApiLibraryNames applies JavaApiLibraryName to the list of java_library names.
-func JavaApiLibraryNames(c Config, names []string) []string {
- apiLibs := make([]string, len(names))
- for i, name := range names {
- apiLibs[i] = JavaApiLibraryName(c, name)
- }
- return apiLibs
-}
-
func (k SdkKind) DefaultJavaLibraryName() string {
switch k {
case SdkPublic: