6f907ad3dd
Previously, android_app targets for which a.shouldEmbedJnis(ctx) = true (e.g. CtsSelinuxTargetSdk25TestCases) would need to specify all of their recursive library dependencies, including for example libc++ when depending on the platform libc++. This means unnecessary churn when we add a new dependency to libc++ (e.g. libunwind [1]). To avoid the churn and allow jni_libs clauses to be simplified, make the build system search for the recursive dependencies and automatically include them. This change allows us to remove code that was previously adding NDK libc++ as a special case, as it is now covered by the generic code. Also fix some improper quoting that was exposed as a result of this change causing more files to be packaged than before. [1] https://android-review.googlesource.com/q/topic:%22libunwind-so%22 Bug: 144430859 Change-Id: I3d6fbcce75bc108a982eb7483992a4b202056339
105 lines
3.1 KiB
Go
105 lines
3.1 KiB
Go
// Copyright 2017 Google Inc. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package cc
|
|
|
|
import (
|
|
"strings"
|
|
"sync"
|
|
|
|
"android/soong/android"
|
|
"android/soong/cc/config"
|
|
)
|
|
|
|
var (
|
|
lsdumpPaths []string
|
|
sabiLock sync.Mutex
|
|
)
|
|
|
|
type SAbiProperties struct {
|
|
CreateSAbiDumps bool `blueprint:"mutated"`
|
|
ReexportedIncludes []string `blueprint:"mutated"`
|
|
}
|
|
|
|
type sabi struct {
|
|
Properties SAbiProperties
|
|
}
|
|
|
|
func (sabimod *sabi) props() []interface{} {
|
|
return []interface{}{&sabimod.Properties}
|
|
}
|
|
|
|
func (sabimod *sabi) begin(ctx BaseModuleContext) {}
|
|
|
|
func (sabimod *sabi) deps(ctx BaseModuleContext, deps Deps) Deps {
|
|
return deps
|
|
}
|
|
|
|
func inListWithPrefixSearch(flag string, filter []string) bool {
|
|
// Assuming the filter is small enough.
|
|
// If the suffix of a filter element is *, try matching prefixes as well.
|
|
for _, f := range filter {
|
|
if (f == flag) || (strings.HasSuffix(f, "*") && strings.HasPrefix(flag, strings.TrimSuffix(f, "*"))) {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
func filterOutWithPrefix(list []string, filter []string) (remainder []string) {
|
|
// Go through the filter, matching and optionally doing a prefix search for list elements.
|
|
for _, l := range list {
|
|
if !inListWithPrefixSearch(l, filter) {
|
|
remainder = append(remainder, l)
|
|
}
|
|
}
|
|
return
|
|
}
|
|
|
|
func (sabimod *sabi) flags(ctx ModuleContext, flags Flags) Flags {
|
|
// Assuming that the cflags which clang LibTooling tools cannot
|
|
// understand have not been converted to ninja variables yet.
|
|
flags.Local.ToolingCFlags = filterOutWithPrefix(flags.Local.CFlags, config.ClangLibToolingUnknownCflags)
|
|
flags.Global.ToolingCFlags = filterOutWithPrefix(flags.Global.CFlags, config.ClangLibToolingUnknownCflags)
|
|
flags.Local.ToolingCppFlags = filterOutWithPrefix(flags.Local.CppFlags, config.ClangLibToolingUnknownCflags)
|
|
flags.Global.ToolingCppFlags = filterOutWithPrefix(flags.Global.CppFlags, config.ClangLibToolingUnknownCflags)
|
|
|
|
return flags
|
|
}
|
|
|
|
func sabiDepsMutator(mctx android.TopDownMutatorContext) {
|
|
if c, ok := mctx.Module().(*Module); ok &&
|
|
((c.IsVndk() && c.UseVndk()) || c.IsLlndk(mctx.Config()) ||
|
|
(c.sabi != nil && c.sabi.Properties.CreateSAbiDumps)) {
|
|
mctx.VisitDirectDeps(func(m android.Module) {
|
|
tag := mctx.OtherModuleDependencyTag(m)
|
|
switch tag {
|
|
case StaticDepTag, staticExportDepTag, lateStaticDepTag, wholeStaticDepTag:
|
|
|
|
cc, _ := m.(*Module)
|
|
if cc == nil {
|
|
return
|
|
}
|
|
cc.sabi.Properties.CreateSAbiDumps = true
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func addLsdumpPath(lsdumpPath string) {
|
|
sabiLock.Lock()
|
|
lsdumpPaths = append(lsdumpPaths, lsdumpPath)
|
|
sabiLock.Unlock()
|
|
}
|