diff options
| author | 2020-06-16 09:37:53 +0000 | |
|---|---|---|
| committer | 2020-06-16 09:37:53 +0000 | |
| commit | e40383355b3e22de4566df94dc6140e47eb695eb (patch) | |
| tree | a2548e402c7ee4702cfed0beae3c56ea8b7cddf4 /apex/apex.go | |
| parent | c9d83d25bbce67c8e6e830113f02be03cf63796b (diff) | |
| parent | eedc5d55ce0d7a40b01b9ed553d0d458054e8560 (diff) | |
Merge "Let APEX build against preferred java_sdk_library_import"
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/apex.go b/apex/apex.go index 4c8575d1b..2e4a32864 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1975,7 +1975,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) |