diff options
| author | Dan Albert <danalbert@google.com> | 2017-12-13 15:03:47 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2017-12-14 14:13:56 -0800 |
| commit | 281f22b3f296674e147acffd7083d4d11f73cf0d (patch) | |
| tree | 1f394f663b0c3283f107c90c21afd6362cd48f6a /cc/library.go | |
| parent | 1e306c172f508151e0944145d6921a5ef2aec6ed (diff) | |
| download | build_soong-281f22b3f296674e147acffd7083d4d11f73cf0d.tar.gz build_soong-281f22b3f296674e147acffd7083d4d11f73cf0d.tar.bz2 build_soong-281f22b3f296674e147acffd7083d4d11f73cf0d.zip | |
Don't install host or VNDK libs to the NDK.
Test: set `static_ndk_lib: true` on compiler-rt-extras, make ndk,
`find out/soong/ndk -name '*.a'`
Bug: None
Change-Id: I6e82d3628efb602963552d3a91ee6176e8f3d2ff
Diffstat (limited to 'cc/library.go')
| -rw-r--r-- | cc/library.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cc/library.go b/cc/library.go index b664a5ec..d53bcfcb 100644 --- a/cc/library.go +++ b/cc/library.go @@ -733,7 +733,8 @@ func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) { 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( ctx, "usr/lib", ctx.toolchain().ClangTriple(), file.Base()) |