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

Commit 2db5641a authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "audio: enable frameworks/av bpfmt PREUPLOAD hooks" into main am: 544bfd01 

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



Change-Id: I7d7dd8069f439916901aa30e1cfc8390bc2d1950
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 54ce13bc 544bfd01

PREUPLOAD.cfg

+21 −0
Original line number Diff line number Diff line
@@ -4,9 +4,30 @@ mainline_hook = ${REPO_ROOT}/frameworks/av/tools/mainline_hook_partial.sh ${REPO 
hidden_api_txt_checksorted_hook = ${REPO_ROOT}/tools/platform-compat/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}



[Builtin Hooks]

bpfmt = true

clang_format = true



[Builtin Hooks Options]

# Enable sort and limit subfolder checks

bpfmt = -s

    media/audio/

    media/audioserver/

    media/libaaudio/

    media/libaudioclient/

    media/libaudiofoundation/

    media/libaudiohal/

    media/libaudioprocessing/

    media/libaudiousecasevalidation/

    media/libeffects/

    media/libmediametrics/

    media/libnbaio/

    media/libnblog/

    services/audioflinger/

    services/audioparameterparser/

    services/audiopolicy/

    services/medialog/

    services/oboeservice/



# Only turn on clang-format check for the following subfolders.

clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp

               media/libaudioclient/tests/

media/libaaudio/examples/input_monitor/Android.bp

+8 −2
Original line number Diff line number Diff line
@@ -11,7 +11,10 @@ cc_test { 
    name: "input_monitor",

    gtest: false,

    srcs: ["src/input_monitor.cpp"],

    cflags: ["-Wall", "-Werror"],

    cflags: [

        "-Wall",

        "-Werror",

    ],

    shared_libs: ["libaaudio"],

    header_libs: ["libaaudio_example_utils"],

}
@@ -20,7 +23,10 @@ cc_test { 
    name: "input_monitor_callback",

    gtest: false,

    srcs: ["src/input_monitor_callback.cpp"],

    cflags: ["-Wall", "-Werror"],

    cflags: [

        "-Wall",

        "-Werror",

    ],

    shared_libs: ["libaaudio"],

    header_libs: ["libaaudio_example_utils"],

}

media/libaaudio/examples/loopback/Android.bp

+6 −3
Original line number Diff line number Diff line
@@ -11,13 +11,16 @@ cc_test { 
    name: "aaudio_loopback",

    gtest: false,

    srcs: ["src/loopback.cpp"],

    cflags: ["-Wall", "-Werror"],

    cflags: [

        "-Wall",

        "-Werror",

    ],

    static_libs: ["libsndfile"],

    include_dirs: ["external/oboe/apps/OboeTester/app/src/main/cpp"],

    shared_libs: [

        "libaaudio",

        "libaudioutils",

        "liblog"

        "liblog",

    ],

    header_libs: ["libaaudio_example_utils"],

}

media/libaaudio/examples/write_sine/Android.bp

+8 −2
Original line number Diff line number Diff line
@@ -10,7 +10,10 @@ package { 
cc_test {

    name: "write_sine",

    srcs: ["src/write_sine.cpp"],

    cflags: ["-Wall", "-Werror"],

    cflags: [

        "-Wall",

        "-Werror",

    ],

    shared_libs: ["libaaudio"],

    header_libs: ["libaaudio_example_utils"],

}
@@ -18,7 +21,10 @@ cc_test { 
cc_test {

    name: "write_sine_callback",

    srcs: ["src/write_sine_callback.cpp"],

    cflags: ["-Wall", "-Werror"],

    cflags: [

        "-Wall",

        "-Werror",

    ],

    shared_libs: ["libaaudio"],

    header_libs: ["libaaudio_example_utils"],

}

media/libaaudio/src/Android.bp

+1 −4
Original line number Diff line number Diff line
@@ -91,13 +91,10 @@ cc_library { 
    cflags: [

        "-Wall",

        "-Werror",

        // By default, all symbols are hidden.



        // "-fvisibility=hidden",

        // AAUDIO_API is used to explicitly export a function or a variable as a visible symbol.

        "-Wno-unused-parameter",

        "-Wthread-safety",



        // AAUDIO_API is used to explicitly export a function or a variable as a visible symbol.

        "-DAAUDIO_API=__attribute__((visibility(\"default\")))",

    ],