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

Merge "Replace is_uses_lib property with provides_uses_lib." am: 79a94a27b6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1423137

Change-Id: I22b08e951667d14b03a52b091ae34ebb885d5fd9
This commit is contained in:
Ulyana Trafimovich
2020-09-10 14:58:14 +00:00
committed by Automerger Merge Worker
parent f15ed4fe61 79a94a27b6
commit df9afcd9b6
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java.go
View File

@@ -1983,9 +1983,9 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {
// added to the Android manifest.
j.exportedSdkLibs.MaybeAddLibraryPath(ctx, j.OptionalImplicitSdkLibrary(), j.DexJarBuildPath(), j.DexJarInstallPath())
// If this is a non-SDK uses-library, export itself.
if proptools.Bool(j.usesLibraryProperties.Is_uses_lib) {
j.exportedSdkLibs.AddLibraryPath(ctx, ctx.ModuleName(), j.DexJarBuildPath(), j.DexJarInstallPath())
// A non-SDK library may provide a <uses-library> (the name may be different from the module name).
if lib := proptools.String(j.usesLibraryProperties.Provides_uses_lib); lib != "" {
j.exportedSdkLibs.AddLibraryPath(ctx, lib, j.DexJarBuildPath(), j.DexJarInstallPath())
}
j.distFiles = j.GenerateTaggedDistFiles(ctx)