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

Merge changes I6a512209,I56437f26

Browse Source 
* changes:
  Unify addition of class loader subcontext from dependencies.
  Move ClassLoaderContexts() method to UsesLibraryDependency interface.
This commit is contained in:
Ulyana Trafimovich
2020-12-22 10:14:41 +00:00
committed by Gerrit Code Review
parent d8065c606c 88bb6f6342
commit b630c37d61
5 changed files with 74 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/sdk_library.go
View File

@@ -28,6 +28,7 @@ import (
"github.com/google/blueprint/proptools"
"android/soong/android"
"android/soong/dexpreopt"
)
const (
@@ -2020,7 +2021,7 @@ func (module *SdkLibraryImport) SdkImplementationJars(ctx android.BaseModuleCont
return module.sdkJars(ctx, sdkVersion, false)
}
// to satisfy SdkLibraryDependency interface
// to satisfy UsesLibraryDependency interface
func (module *SdkLibraryImport) DexJarBuildPath() android.Path {
if module.implLibraryModule == nil {
return nil
@@ -2029,7 +2030,7 @@ func (module *SdkLibraryImport) DexJarBuildPath() android.Path {
}
}
// to satisfy SdkLibraryDependency interface
// to satisfy UsesLibraryDependency interface
func (module *SdkLibraryImport) DexJarInstallPath() android.Path {
if module.implLibraryModule == nil {
return nil
@@ -2038,6 +2039,11 @@ func (module *SdkLibraryImport) DexJarInstallPath() android.Path {
}
}
// to satisfy UsesLibraryDependency interface
func (module *SdkLibraryImport) ClassLoaderContexts() dexpreopt.ClassLoaderContextMap {
return nil
}
// to satisfy apex.javaDependency interface
func (module *SdkLibraryImport) JacocoReportClassesFile() android.Path {
if module.implLibraryModule == nil {