diff options
Diffstat (limited to 'build/Android.bp')
| -rw-r--r-- | build/Android.bp | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/build/Android.bp b/build/Android.bp index d2545a401d..77f7313fc4 100644 --- a/build/Android.bp +++ b/build/Android.bp @@ -28,28 +28,28 @@ bootstrap_go_package { } art_clang_tidy_errors = [ + "android-cloexec-dup", + "android-cloexec-fopen", "android-cloexec-open", + "bugprone-argument-comment", "bugprone-lambda-function-name", + "bugprone-macro-parentheses", "bugprone-unused-raii", // Protect scoped things like MutexLock. - "bugprone-virtual-near-miss", - "modernize-use-bool-literals", - "performance-implicit-conversion-in-loop", - "performance-unnecessary-copy-initialization", -] - -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", - "bugprone-argument-comment", "bugprone-unused-return-value", + "bugprone-virtual-near-miss", "misc-unused-using-decls", + "modernize-use-bool-literals", "modernize-use-nullptr", - "modernize-use-using", "performance-faster-string-find", "performance-for-range-copy", + "performance-implicit-conversion-in-loop", + "performance-inefficient-vector-operation", + "performance-no-automatic-move", "performance-noexcept-move-constructor", + "performance-unnecessary-copy-initialization", "performance-unnecessary-value-param", + "readability-duplicate-include", + "readability-redundant-string-cstr", ] art_clang_tidy_disabled = [ @@ -66,6 +66,9 @@ art_clang_tidy_disabled = [ "-modernize-return-braced-init-list", "-modernize-use-default-member-init", "-modernize-pass-by-value", + // The only two remaining offenders are art/openjdkjvmti/include/jvmti.h and + // libcore/ojluni/src/main/native/jvm.h, which are both external files by Oracle + "-modernize-use-using", ] soong_config_module_type_import { @@ -185,6 +188,10 @@ art_module_art_global_defaults { // Apple, it's a pain. "-Wmissing-noreturn", ], + // Don't export symbols of statically linked libziparchive. + // Workaround to fix ODR violations (b/264235288) in gtests. + // `--exclude-libs` flag is not supported on windows/darwin. + ldflags: ["-Wl,--exclude-libs=libziparchive.a"], }, linux_bionic: { strip: { @@ -238,6 +245,9 @@ art_module_art_global_defaults { arm64: { cflags: ["-DART_ENABLE_CODEGEN_arm64"], }, + riscv64: { + cflags: ["-DART_ENABLE_CODEGEN_riscv64"], + }, x86: { cflags: ["-DART_ENABLE_CODEGEN_x86"], }, @@ -246,7 +256,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, @@ -275,6 +285,9 @@ cc_defaults { arm64: { ldflags: ["-z max-page-size=0x200000"], }, + riscv64: { + ldflags: ["-z max-page-size=0x200000"], + }, x86_64: { ldflags: ["-z max-page-size=0x200000"], }, |