From 51271c1fb4bfa8b294f2613c4d37c173f1f15552 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Wed, 30 Jan 2019 16:02:22 +0000 Subject: [PATCH] exclude_shared_libs should exlude headers in {static|shared}.export_*_lib_headers Bug: 122882789 Test: m droid vts Change-Id: I33ec75fa908e557eeadc91c5ca1a5e180bc9f31b --- cc/library.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cc/library.go b/cc/library.go index 7213a735e..c01b3e742 100644 --- a/cc/library.go +++ b/cc/library.go @@ -580,11 +580,15 @@ func (library *libraryDecorator) linkerDeps(ctx DepsContext, deps Deps) Deps { deps.WholeStaticLibs = removeListFromList(deps.WholeStaticLibs, library.baseLinker.Properties.Target.Vendor.Exclude_static_libs) deps.SharedLibs = removeListFromList(deps.SharedLibs, library.baseLinker.Properties.Target.Vendor.Exclude_shared_libs) deps.StaticLibs = removeListFromList(deps.StaticLibs, library.baseLinker.Properties.Target.Vendor.Exclude_static_libs) + deps.ReexportSharedLibHeaders = removeListFromList(deps.ReexportSharedLibHeaders, library.baseLinker.Properties.Target.Vendor.Exclude_shared_libs) + deps.ReexportStaticLibHeaders = removeListFromList(deps.ReexportStaticLibHeaders, library.baseLinker.Properties.Target.Vendor.Exclude_static_libs) } if ctx.inRecovery() { deps.WholeStaticLibs = removeListFromList(deps.WholeStaticLibs, library.baseLinker.Properties.Target.Recovery.Exclude_static_libs) deps.SharedLibs = removeListFromList(deps.SharedLibs, library.baseLinker.Properties.Target.Recovery.Exclude_shared_libs) deps.StaticLibs = removeListFromList(deps.StaticLibs, library.baseLinker.Properties.Target.Recovery.Exclude_static_libs) + deps.ReexportSharedLibHeaders = removeListFromList(deps.ReexportSharedLibHeaders, library.baseLinker.Properties.Target.Recovery.Exclude_shared_libs) + deps.ReexportStaticLibHeaders = removeListFromList(deps.ReexportStaticLibHeaders, library.baseLinker.Properties.Target.Recovery.Exclude_static_libs) } android.ExtractSourceDeps(ctx, library.Properties.Unexported_symbols_list)