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

Merge "Let APEX build against preferred java_sdk_library_import" into rvc-dev

Browse Source
This commit is contained in:
Anton Hansson
2020-06-16 17:47:16 +00:00
committed by Android (Google) Code Review
parent f4a5492ec9 f642a31ab5
commit c3754ba042
3 changed files with 248 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex.go
View File

@@ -1964,7 +1964,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
case javaLibTag:
switch child.(type) {
case *java.Library, *java.SdkLibrary, *java.DexImport:
case *java.Library, *java.SdkLibrary, *java.DexImport, *java.SdkLibraryImport:
af := apexFileForJavaLibrary(ctx, child.(javaDependency), child.(android.Module))
if !af.Ok() {
ctx.PropertyErrorf("java_libs", "%q is not configured to be compiled into dex", depName)