Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49f61b6a authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "AudioFlinger: Group common compile flags together" am: d368c88a am: 03948ac8 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2625185



Change-Id: I122f875857472d70125f70691b95be06f9d21069
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5964e0bb 03948ac8

services/audioflinger/Android.bp

+27 −26
Original line number Diff line number Diff line
@@ -97,12 +97,7 @@ audioflinger_tidy_errors = audioflinger_base_tidy_errors + [ 
    "-performance-no-int-to-ptr",

]



// Eventually use common tidy defaults

cc_defaults {

    name: "audioflinger_flags_defaults",

    // https://clang.llvm.org/docs/UsersManual.html#command-line-options

    // https://clang.llvm.org/docs/DiagnosticsReference.html

    cflags: [

audioflinger_base_cflags = [

    "-Wall",

    "-Wdeprecated",

    "-Werror",
@@ -126,8 +121,14 @@ cc_defaults { 
    "-Wunreachable-code-return",

    "-Wunused",

    "-Wused-but-marked-unused",

        "-D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS",

    ],

]



// Eventually use common tidy defaults

cc_defaults {

    name: "audioflinger_flags_defaults",

    // https://clang.llvm.org/docs/UsersManual.html#command-line-options

    // https://clang.llvm.org/docs/DiagnosticsReference.html

    cflags: audioflinger_base_cflags,

    // https://clang.llvm.org/extra/clang-tidy/

    tidy: true,

    tidy_checks: audioflinger_tidy_errors,

services/audioflinger/afutils/Android.bp

+1 −26
Original line number Diff line number Diff line
@@ -17,32 +17,7 @@ cc_defaults { 
    name: "audioflinger_utils_flags_defaults",

    // https://clang.llvm.org/docs/UsersManual.html#command-line-options

    // https://clang.llvm.org/docs/DiagnosticsReference.html

    cflags: [

        "-Wall",

        "-Wdeprecated",

        "-Werror",

        "-Werror=implicit-fallthrough",

        "-Werror=sometimes-uninitialized",

        "-Werror=conditional-uninitialized",

        "-Wextra",



        // suppress some warning chatter.

        "-Wno-deprecated-copy-with-dtor",

        "-Wno-deprecated-copy-with-user-provided-dtor",



        "-Wredundant-decls",

        "-Wshadow",

        "-Wstrict-aliasing",

        "-fstrict-aliasing",

        "-Wthread-safety",

        //"-Wthread-safety-negative", // experimental - looks broken in R.

        "-Wunreachable-code",

        "-Wunreachable-code-break",

        "-Wunreachable-code-return",

        "-Wunused",

        "-Wused-but-marked-unused",

        "-D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS",

    ],

    cflags: audioflinger_base_cflags,

    // https://clang.llvm.org/extra/clang-tidy/

    tidy: true,

    tidy_checks: audioflinger_utils_tidy_errors,

services/audioflinger/fastpath/Android.bp

+1 −26
Original line number Diff line number Diff line
@@ -18,32 +18,7 @@ cc_defaults { 
    name: "fastpath_flags_defaults",

    // https://clang.llvm.org/docs/UsersManual.html#command-line-options

    // https://clang.llvm.org/docs/DiagnosticsReference.html

    cflags: [

        "-Wall",

        "-Wdeprecated",

        "-Werror",

        "-Werror=implicit-fallthrough",

        "-Werror=sometimes-uninitialized",

        "-Werror=conditional-uninitialized",

        "-Wextra",



        // suppress some warning chatter.

        "-Wno-deprecated-copy-with-dtor",

        "-Wno-deprecated-copy-with-user-provided-dtor",



        "-Wredundant-decls",

        "-Wshadow",

        "-Wstrict-aliasing",

        "-fstrict-aliasing",

        "-Wthread-safety",

        //"-Wthread-safety-negative", // experimental - looks broken in R.

        "-Wunreachable-code",

        "-Wunreachable-code-break",

        "-Wunreachable-code-return",

        "-Wunused",

        "-Wused-but-marked-unused",

        "-D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS",

    ],

    cflags: audioflinger_base_cflags,

    // https://clang.llvm.org/extra/clang-tidy/

    tidy: true,

    tidy_checks: fastpath_tidy_errors,