Propagate transitive SDK Java library dependencies to dexpreopt.
For some dependencies, like stubs, the SDK library may not be found at build time (either because the implementation library is not among the dependencies of the dexpreopted module, or because it's part of a prebuilt, or because it's missing from the build altogether). In such cases dexpreopt is useless, because dex2oat does not have access to the full classpath (unless the &-classpath is used). Therefore do not dexpreopt in such cases. Test: lunch aosp_cf_x86_phone-userdebug && m Bug: 132357300 Change-Id: If289088cfd103011ccb16165e95a97b30fd31b81
This commit is contained in:
@@ -390,7 +390,7 @@ func aaptLibs(ctx android.ModuleContext, sdkContext sdkContext) (transitiveStati
|
||||
// (including the java_sdk_library) itself then append any implicit sdk library
|
||||
// names to the list of sdk libraries to be added to the manifest.
|
||||
if component, ok := module.(SdkLibraryComponentDependency); ok {
|
||||
sdkLibraries.AddLibraryPath(ctx, component.OptionalImplicitSdkLibrary(),
|
||||
sdkLibraries.MaybeAddLibraryPath(ctx, component.OptionalImplicitSdkLibrary(),
|
||||
component.DexJarBuildPath(), component.DexJarInstallPath())
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user