diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-10 07:27:41 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-10 07:27:41 +0000 |
| commit | 0a81d326546d738d988418ffc4e9d57cadeadfc5 (patch) | |
| tree | 73b146ab7c97eb735cfabb22ac3385d2fcc808e8 | |
| parent | 1cf94219cc49668e1298709a6c1fa70c1a4387df (diff) | |
| parent | 88e6f14a6bcc1e755809b07d0a919443fb32a41c (diff) | |
| download | build_soong-0a81d326546d738d988418ffc4e9d57cadeadfc5.tar.gz build_soong-0a81d326546d738d988418ffc4e9d57cadeadfc5.tar.bz2 build_soong-0a81d326546d738d988418ffc4e9d57cadeadfc5.zip | |
release-request-7f84484c-eec6-4577-8d5a-55079be4f3c5-for-git_oc-mr1-release-4262309 snap-temp-L02100000091441105
Change-Id: Id1a3f48566a45da6621ba15173ad2b3c20e154d1
| -rw-r--r-- | cc/library.go | 2 | ||||
| -rw-r--r-- | cc/linker.go | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/cc/library.go b/cc/library.go index 3d463bdb..4e3e2b39 100644 --- a/cc/library.go +++ b/cc/library.go @@ -351,7 +351,7 @@ func (library *libraryDecorator) compile(ctx ModuleContext, flags Flags, deps Pa } return Objects{} } - if ctx.createVndkSourceAbiDump() { + if ctx.createVndkSourceAbiDump() || library.sabi.Properties.CreateSAbiDumps { exportIncludeDirs := android.PathsForModuleSrc(ctx, library.flagExporter.Properties.Export_include_dirs) var SourceAbiFlags []string for _, dir := range exportIncludeDirs.Strings() { diff --git a/cc/linker.go b/cc/linker.go index 1a842ae2..5250d2d6 100644 --- a/cc/linker.go +++ b/cc/linker.go @@ -131,15 +131,16 @@ func (linker *baseLinker) linkerDeps(ctx BaseModuleContext, deps Deps) Deps { deps.StaticLibs = append(deps.StaticLibs, linker.Properties.Static_libs...) deps.SharedLibs = append(deps.SharedLibs, linker.Properties.Shared_libs...) - if ctx.vndk() { - deps.SharedLibs = removeListFromList(deps.SharedLibs, linker.Properties.Target.Vendor.Exclude_shared_libs) - } - deps.ReexportHeaderLibHeaders = append(deps.ReexportHeaderLibHeaders, linker.Properties.Export_header_lib_headers...) deps.ReexportStaticLibHeaders = append(deps.ReexportStaticLibHeaders, linker.Properties.Export_static_lib_headers...) deps.ReexportSharedLibHeaders = append(deps.ReexportSharedLibHeaders, linker.Properties.Export_shared_lib_headers...) deps.ReexportGeneratedHeaders = append(deps.ReexportGeneratedHeaders, linker.Properties.Export_generated_headers...) + if ctx.vndk() { + deps.SharedLibs = removeListFromList(deps.SharedLibs, linker.Properties.Target.Vendor.Exclude_shared_libs) + deps.ReexportSharedLibHeaders = removeListFromList(deps.ReexportSharedLibHeaders, linker.Properties.Target.Vendor.Exclude_shared_libs) + } + if ctx.ModuleName() != "libcompiler_rt-extras" { deps.LateStaticLibs = append(deps.LateStaticLibs, "libcompiler_rt-extras") } |