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

Commit 4e76a190 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "AudioFlinger: Group common compile flags together" into udc-dev-plus-aosp am: ace82ad5 

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



Change-Id: I3bc899bba533011ddbaef8e2d31a6e34a4d84359
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9e2fff28 ace82ad5

services/audioflinger/Android.bp

+27 −26
Original line number Diff line number Diff line
@@ -94,12 +94,7 @@ 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",
@@ -123,8 +118,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: tidy_errors,

services/audioflinger/afutils/Android.bp

+1 −26
Original line number Diff line number Diff line
@@ -69,32 +69,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
@@ -70,32 +70,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,

services/audioflinger/sounddose/Android.bp

+1 −26
Original line number Diff line number Diff line
@@ -68,32 +68,7 @@ cc_defaults { 
    name: "audioflinger_sounddose_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_sounddose_tidy_errors,