Merge "Add bpf_syscall_wrappers for tethering apex and update allowed-deps.txt"
diff --git a/apex/allowed_deps.txt b/apex/allowed_deps.txt
index 624f9ad..146fe56 100644
--- a/apex/allowed_deps.txt
+++ b/apex/allowed_deps.txt
@@ -487,6 +487,8 @@
neuralnetworks_utils_hal_1_3(minSdkVersion:30)
neuralnetworks_utils_hal_common(minSdkVersion:30)
neuralnetworks_utils_hal_service(minSdkVersion:30)
+note_memtag_heap_async(minSdkVersion:16)
+note_memtag_heap_sync(minSdkVersion:16)
PermissionController(minSdkVersion:28)
permissioncontroller-statsd(minSdkVersion:current)
philox_random(minSdkVersion:(no version))
diff --git a/cc/config/tidy.go b/cc/config/tidy.go
index 4ac9e58..e5bea4b 100644
--- a/cc/config/tidy.go
+++ b/cc/config/tidy.go
@@ -21,23 +21,28 @@
func init() {
// Most Android source files are not clang-tidy clean yet.
- // Global tidy checks include only google*, performance*,
- // and misc-macro-parentheses, but not google-readability*
- // or google-runtime-references.
+ // Default global tidy checks must exclude all checks that
+ // have found too many false positives.
pctx.VariableFunc("TidyDefaultGlobalChecks", func(ctx android.PackageVarContext) string {
if override := ctx.Config().Getenv("DEFAULT_GLOBAL_TIDY_CHECKS"); override != "" {
return override
}
return strings.Join([]string{
- "-*",
- "bugprone*",
- "clang-diagnostic-unused-command-line-argument",
- "google*",
- "misc-macro-parentheses",
- "performance*",
+ "*",
+ "-altera-*",
"-bugprone-narrowing-conversions",
- "-google-readability*",
+ "-cppcoreguidelines-*",
+ "-fuchsia-*",
+ "-google-readability-*",
"-google-runtime-references",
+ "-hicpp-*",
+ "-llvm-*",
+ "-llvmlibc-*",
+ "-misc-no-recursion",
+ "-misc-non-private-member-variables-in-classes",
+ "-misc-unused-parameters",
+ "-modernize-*",
+ "-readability-*",
}, ",")
})
diff --git a/scripts/build-mainline-modules.sh b/scripts/build-mainline-modules.sh
index 6db870f..ea62af4 100755
--- a/scripts/build-mainline-modules.sh
+++ b/scripts/build-mainline-modules.sh
@@ -26,6 +26,7 @@
platform-mainline-test-exports
runtime-module-host-exports
runtime-module-sdk
+ tzdata-module-test-exports
)
# List of libraries installed on the platform that are needed for ART chroot