Merge "Exclude dirs from binder interface whitelisting"

am: 1fdb0b55a5

Change-Id: I4cb503b3aa804f8ffd9e0ca0deeafc96abb1504d
This commit is contained in:
Ivan Lozano
2019-12-05 18:29:28 -08:00
committed by android-build-merger
2 changed files with 11 additions and 0 deletions

View File

@@ -27,6 +27,10 @@ import (
"android/soong/cc/config"
)
var (
allowedManualInterfacePaths = []string{"vendor/", "hardware/"}
)
// This file contains the basic C/C++/assembly to .o compliation steps
type BaseCompilerProperties struct {
@@ -509,6 +513,12 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
flags.Local.CFlags = append(flags.Local.CFlags, "-fopenmp")
}
// Exclude directories from manual binder interface whitelisting.
//TODO(b/145621474): Move this check into IInterface.h when clang-tidy no longer uses absolute paths.
if android.PrefixInList(ctx.ModuleDir(), allowedManualInterfacePaths) {
flags.Local.CFlags = append(flags.Local.CFlags, "-DDO_NOT_CHECK_MANUAL_BINDER_INTERFACES")
}
return flags
}

View File

@@ -147,6 +147,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("WITH_TIDY_FLAGS", "${config.TidyWithTidyFlags}")
ctx.Strict("AIDL_CPP", "${aidlCmd}")
ctx.Strict("ALLOWED_MANUAL_INTERFACE_PATHS", strings.Join(allowedManualInterfacePaths, " "))
ctx.Strict("M4", "${m4Cmd}")