diff options
| author | Jayant Chowdhary <jchowdhary@google.com> | 2017-08-07 14:09:45 -0700 |
|---|---|---|
| committer | Jayant Chowdhary <jchowdhary@google.com> | 2017-08-08 23:14:31 +0000 |
| commit | bbf2d25cb73dde6c7be400a6e0ddb9027ed2389e (patch) | |
| tree | bd67c9c43c0a87f0d74e30c4152322cf3c388f0d | |
| parent | 7ec6cb270bf206ce0af29160b9bb66e6598a8134 (diff) | |
| download | build_soong-bbf2d25cb73dde6c7be400a6e0ddb9027ed2389e.tar.gz build_soong-bbf2d25cb73dde6c7be400a6e0ddb9027ed2389e.tar.bz2 build_soong-bbf2d25cb73dde6c7be400a6e0ddb9027ed2389e.zip | |
Allow vndk library dependecies to dump abi again.
As a part of the fix for bug 38304436, the condition for dumping abi for
a source file was reduced to : if the source file belongs to a library
belonging the vndk or the llndk, dump the abi. This needs to be changed back to:
if the source file comes through a dependency of a vndk library (static,
whole static or source), whether or not the dependency may be vndk-enabled, dump
the abi.
Test: mm -j64 in external/libcxx.
Without the change, libc++ does not produce any abi dump, since it
depends on whole static libraries not marked vndk enabled. After the
change, libc++ has an abi dump combining abi exposed by whole static,
static and source dependencies.
Bug: 38304436
Merged-In: I07563da68a03b11236b0d7a7ce5ca35cc36bd1df
Change-Id: Ida3dceeca11342756191f316bee74ea08bcdd984
(cherry picked from commit 2a96640335aa5d3d9a977032c7aa3cb487829b9a)
| -rw-r--r-- | cc/library.go | 2 |
1 files changed, 1 insertions, 1 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() { |