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

6
java/config/makevars.go
View File

@@ -29,10 +29,8 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
// These are used by make when LOCAL_PRIVATE_PLATFORM_APIS is set (equivalent to platform_apis in blueprint):
ctx.Strict("LEGACY_CORE_PLATFORM_BOOTCLASSPATH_LIBRARIES",
strings.Join(android.JavaApiLibraryNames(ctx.Config(), LegacyCorePlatformBootclasspathLibraries), " "))
ctx.Strict("LEGACY_CORE_PLATFORM_SYSTEM_MODULES",
android.JavaApiLibraryName(ctx.Config(), LegacyCorePlatformSystemModules),
)
strings.Join(LegacyCorePlatformBootclasspathLibraries, " "))
ctx.Strict("LEGACY_CORE_PLATFORM_SYSTEM_MODULES", LegacyCorePlatformSystemModules)
ctx.Strict("ANDROID_JAVA_HOME", "${JavaHome}")
ctx.Strict("ANDROID_JAVA8_HOME", "prebuilts/jdk/jdk8/${hostPrebuiltTag}")