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
This commit is contained in:
@@ -459,7 +459,7 @@ func sdkDeps(ctx android.BottomUpMutatorContext, sdkContext android.SdkContext,
|
||||
ctx.AddVariationDependencies(nil, sdkLibTag, sdkDep.classpath...)
|
||||
if d.effectiveOptimizeEnabled() && sdkDep.hasStandardLibs() {
|
||||
ctx.AddVariationDependencies(nil, proguardRaiseTag,
|
||||
android.JavaApiLibraryNames(ctx.Config(), config.LegacyCorePlatformBootclasspathLibraries)...,
|
||||
config.LegacyCorePlatformBootclasspathLibraries...,
|
||||
)
|
||||
}
|
||||
if d.effectiveOptimizeEnabled() && sdkDep.hasFrameworkLibs() {
|
||||
|
Reference in New Issue
Block a user