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

Cleanup remaining android.JavaApiLibraryName() references

Browse Source 
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
This commit is contained in:
Jihoon Kang
2023-06-14 22:43:25 +00:00
parent 3d4d88d68e
commit 6c0df88809
8 changed files with 10 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
android/sdk_version.go
View File

@@ -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: