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

Merge "Introduce AlwaysUsePrebuiltSdks"

Browse Source
This commit is contained in:
Jeongik Cha
2020-08-10 00:51:56 +00:00
committed by Gerrit Code Review
parent 91c3e4ec1a 816a23a50d
commit 6df337255c
12 changed files with 59 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/aar.go
View File

@@ -625,7 +625,7 @@ func (a *AARImport) JacocoReportClassesFile() android.Path {
}
func (a *AARImport) DepsMutator(ctx android.BottomUpMutatorContext) {
if !ctx.Config().UnbundledBuildUsePrebuiltSdks() {
if !ctx.Config().AlwaysUsePrebuiltSdks() {
sdkDep := decodeSdkDep(ctx, sdkContext(a))
if sdkDep.useModule && sdkDep.frameworkResModule != "" {
ctx.AddVariationDependencies(nil, frameworkResTag, sdkDep.frameworkResModule)