summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build/Android.bp9
-rw-r--r--libartbase/base/file_utils.cc2
2 files changed, 3 insertions, 8 deletions
diff --git a/build/Android.bp b/build/Android.bp
index ccc30efc31..382b0a32b6 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -28,6 +28,7 @@ bootstrap_go_package {
}
art_clang_tidy_errors = [
+ "android-cloexec-dup",
"android-cloexec-open",
"bugprone-argument-comment",
"bugprone-lambda-function-name",
@@ -46,12 +47,6 @@ art_clang_tidy_errors = [
"performance-unnecessary-value-param",
]
-art_clang_tidy_allowed = [
- // Many files have these warnings. Move them to art_clang_tidy_errors
- // when all files are free of these warnings.
- "android-cloexec-dup",
-]
-
art_clang_tidy_disabled = [
"-google-default-arguments",
// We have local stores that are only used for debug checks.
@@ -249,7 +244,7 @@ art_module_art_global_defaults {
},
},
- tidy_checks: art_clang_tidy_errors + art_clang_tidy_allowed + art_clang_tidy_disabled,
+ tidy_checks: art_clang_tidy_errors + art_clang_tidy_disabled,
tidy_checks_as_errors: art_clang_tidy_errors,
diff --git a/libartbase/base/file_utils.cc b/libartbase/base/file_utils.cc
index ed883f894f..239628978e 100644
--- a/libartbase/base/file_utils.cc
+++ b/libartbase/base/file_utils.cc
@@ -735,7 +735,7 @@ int DupCloexec(int fd) {
#if defined(__linux__)
return fcntl(fd, F_DUPFD_CLOEXEC, 0);
#else
- return dup(fd);
+ return dup(fd); // NOLINT
#endif
}