Merge "idmap2: fix for compiler update." am: 0cb190e889 am: 951a22e80e am: c0e80b3048 am: 1d861c7292

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768613 Change-Id: Icefda6202f90e3b009b84b13636cb94f8321d26b
2021-07-16 22:45:54 +00:00
parent 158f8bd5ad 1d861c7292
commit dda7142b1e
1 changed files with 2 additions and 0 deletions
--- a/cmds/idmap2/Android.bp
+++ b/cmds/idmap2/Android.bp
@@ -35,8 +35,10 @@ cc_defaults {
    tidy_checks_as_errors: [
        "modernize-*",
        "-modernize-avoid-c-arrays",
+        "-modernize-concat-nested-namespaces",
        "-modernize-pass-by-value",
        "-modernize-replace-disallow-copy-and-assign-macro",
+        "-modernize-return-braced-init-list",
        "-modernize-use-equals-default",
        "-modernize-use-nodiscard",
        "-modernize-use-override",