diff options
| author | Victor Khimenko <khim@google.com> | 2020-06-25 14:02:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-25 14:02:04 +0000 |
| commit | 82f62fdac4ccb234585751b3631567226e8f5c58 (patch) | |
| tree | fb5f7f973dc686012bec994d52300e233e98fc3c | |
| parent | 16e8b0492d25772c5fdae76265a1830c147dcf2e (diff) | |
| parent | 1429cdcf87fe1e345fe435a1f1821df044bb8489 (diff) | |
| download | build_soong-82f62fdac4ccb234585751b3631567226e8f5c58.tar.gz build_soong-82f62fdac4ccb234585751b3631567226e8f5c58.tar.bz2 build_soong-82f62fdac4ccb234585751b3631567226e8f5c58.zip | |
Merge "Add exclude_shared_libs, expand exclude_static_libs to cover static_libs" into rvc-dev
| -rw-r--r-- | cc/linker.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cc/linker.go b/cc/linker.go index d56c733c..00992657 100644 --- a/cc/linker.go +++ b/cc/linker.go @@ -177,7 +177,10 @@ type BaseLinkerProperties struct { Version_script *string `android:"path,arch_variant"` // list of static libs that should not be used to build this module - Exclude_static_libs []string + Exclude_static_libs []string `android:"arch_variant"` + + // list of shared libs that should not be used to build this module + Exclude_shared_libs []string `android:"arch_variant"` } func NewBaseLinker(sanitize *sanitize) *baseLinker { @@ -223,6 +226,8 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps { deps.ReexportSharedLibHeaders = append(deps.ReexportSharedLibHeaders, linker.Properties.Export_shared_lib_headers...) deps.ReexportGeneratedHeaders = append(deps.ReexportGeneratedHeaders, linker.Properties.Export_generated_headers...) + deps.SharedLibs = removeListFromList(deps.SharedLibs, linker.Properties.Exclude_shared_libs) + deps.StaticLibs = removeListFromList(deps.StaticLibs, linker.Properties.Exclude_static_libs) deps.WholeStaticLibs = removeListFromList(deps.WholeStaticLibs, linker.Properties.Exclude_static_libs) if Bool(linker.Properties.Use_version_lib) { |