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

Merge "Don't install host or VNDK libs to the NDK." am: d0e4cc1dc4

Browse Source 
am: 48a1ab930a

Change-Id: Ia203ecbea5055f8c1f573b45a2c52728ea5df679
This commit is contained in:
Dan Albert
2017-12-15 23:12:21 +00:00
committed by android-build-merger
parent ffea3fbfae 48a1ab930a
commit d002d7197b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cc/library.go
View File

@@ -733,7 +733,8 @@ func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) {
library.baseInstaller.install(ctx, file) library.baseInstaller.install(ctx, file)
} }
if Bool(library.Properties.Static_ndk_lib) && library.static() { if Bool(library.Properties.Static_ndk_lib) && library.static() &&
!ctx.useVndk() && ctx.Device() {
installPath := getNdkSysrootBase(ctx).Join( installPath := getNdkSysrootBase(ctx).Join(
ctx, "usr/lib", ctx.toolchain().ClangTriple(), file.Base()) ctx, "usr/lib", ctx.toolchain().ClangTriple(), file.Base())