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:
@@ -647,7 +647,7 @@ func (s StubDexJarsByModule) addStubDexJar(ctx android.ModuleContext, module and
|
||||
// public version is provided by the art.module.public.api module. In those cases it is necessary
|
||||
// to treat all those modules as they were the same name, otherwise it will result in multiple
|
||||
// definitions of a single class being passed to hidden API processing which will cause an error.
|
||||
if name == scope.nonUpdatablePrebuiltModule || name == android.JavaApiLibraryName(ctx.Config(), scope.nonUpdatableSourceModule) {
|
||||
if name == scope.nonUpdatablePrebuiltModule || name == scope.nonUpdatableSourceModule {
|
||||
// Treat all *android-non-updatable* modules as if they were part of an android-non-updatable
|
||||
// java_sdk_library.
|
||||
// TODO(b/192067200): Remove once android-non-updatable is a java_sdk_library or equivalent.
|
||||
|
Reference in New Issue
Block a user