diff options
| author | Chih-hung Hsieh <chh@google.com> | 2021-02-23 23:56:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-23 23:56:12 +0000 |
| commit | d82f6409a2c939b8a24947f396cc516a9c556944 (patch) | |
| tree | b3cb4bc1f63952ff17a40292f82e859269dbd929 | |
| parent | 4d208ac97ea3fa493fa878a8bcc8e1c5a96a9b50 (diff) | |
| parent | af4f8b95103a22185b89449678076090fb870d22 (diff) | |
Merge "Do not add quotes around flags argument" am: af4f8b9510
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598500
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3f053a9b5419dc9422720dca4577615538ece2a4
| -rw-r--r-- | media/jni/soundpool/Android.bp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/media/jni/soundpool/Android.bp b/media/jni/soundpool/Android.bp index 7b498e027d1c..b3406cd89046 100644 --- a/media/jni/soundpool/Android.bp +++ b/media/jni/soundpool/Android.bp @@ -45,26 +45,30 @@ tidy_errors = [ "modernize-return-braced-init-list", "modernize-shrink-to-fit", "modernize-unary-static-assert", - "modernize-use-auto", // debatable - auto can obscure type + // "modernize-use-auto", // found in StreamManager.h, debatable - auto can obscure type "modernize-use-bool-literals", "modernize-use-default-member-init", "modernize-use-emplace", "modernize-use-equals-default", "modernize-use-equals-delete", - "modernize-use-nodiscard", + // "modernize-use-nodiscard", // found in SteamManager.h "modernize-use-noexcept", "modernize-use-nullptr", "modernize-use-override", //"modernize-use-trailing-return-type", // not necessarily more readable "modernize-use-transparent-functors", "modernize-use-uncaught-exceptions", - "modernize-use-using", + //"modernize-use-using", // found in SoundManager.h "performance-*", // Remove some pedantic stylistic requirements. "-google-readability-casting", // C++ casts not always necessary and may be verbose "-google-readability-todo", // do not require TODO(info) "-google-build-using-namespace", // Reenable and fix later. + + "-google-explicit-constructor", // found in StreamManager.h + "-misc-non-private-member-variables-in-classes", // found in SoundManager.h + "-performance-unnecessary-value-param", // found in StreamManager.h ] cc_defaults { @@ -96,8 +100,7 @@ cc_defaults { tidy_checks: tidy_errors, tidy_checks_as_errors: tidy_errors, tidy_flags: [ - "-format-style='file'", - "--header-filter='frameworks/base/media/jni/soundpool'", + "-format-style=file", ], } |