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

Merge "Revert^2 "Add sdk mutator for native modules""

Browse Source
This commit is contained in:
Colin Cross
2020-04-08 18:29:30 +00:00
committed by Gerrit Code Review
parent 9e06bb64ca c511bc50dc
commit ff550f3e13
21 changed files with 401 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/library.go
View File

@@ -1237,7 +1237,7 @@ func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) {
if Bool(library.Properties.Static_ndk_lib) && library.static() &&
!ctx.useVndk() && !ctx.inRamdisk() && !ctx.inRecovery() && ctx.Device() &&
library.baseLinker.sanitize.isUnsanitizedVariant() &&
!library.buildStubs() {
!library.buildStubs() && ctx.sdkVersion() == "" {
installPath := getNdkSysrootBase(ctx).Join(
ctx, "usr/lib", config.NDKTriple(ctx.toolchain()), file.Base())