Use -Werror in frameworks/av

* Suppress unused-variable warnings. Bug: 66996870 Test: build with WITH_TIDY=1 Exempt-From-Owner-Approval: already had multiple +2 votes Change-Id: I985f9328684df501b5934a5c01f783ed7ca5aa0c
7 years ago · 5cf0751390
parent 16f2c1559c
commit 5cf0751390
24 changed files with 65 additions and 0 deletions
--- a/drm/common/Android.bp
+++ b/drm/common/Android.bp
@ -33,6 +33,8 @@ cc_library_static {
        "ReadWriteUtils.cpp",
    ],

+    cflags: ["-Wall", "-Werror"],
+
    static_libs: ["libbinder"],

    export_include_dirs: ["include"],
--- a/drm/libdrmframework/plugins/common/util/Android.bp
+++ b/drm/libdrmframework/plugins/common/util/Android.bp
@ -19,5 +19,7 @@ cc_library_static {

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

+    cflags: ["-Wall", "-Werror"],
+
    export_include_dirs: ["include"],
 }
--- a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.bp
+++ b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.bp
@ -21,6 +21,9 @@ cc_library_shared {
        "-DUSE_64BIT_DRM_API",
        // The flag below turns on local debug printouts
        //"-DDRM_OMA_FL_ENGINE_DEBUG",
+        "-Wall",
+        "-Werror",
+        "-Wno-unused-variable",
    ],

    srcs: ["src/FwdLockEngine.cpp"],
--- a/drm/libdrmframework/plugins/forward-lock/internal-format/common/Android.bp
+++ b/drm/libdrmframework/plugins/forward-lock/internal-format/common/Android.bp
@ -19,6 +19,8 @@ cc_library_static {

    srcs: ["FwdLockGlue.c"],

+    cflags: ["-Wall", "-Werror"],
+
    shared_libs: ["libcrypto"],

    export_include_dirs: ["."],
--- a/drm/libdrmframework/plugins/forward-lock/internal-format/converter/Android.bp
+++ b/drm/libdrmframework/plugins/forward-lock/internal-format/converter/Android.bp
@ -19,6 +19,8 @@ cc_library_static {

    srcs: ["FwdLockConv.c"],

+    cflags: ["-Wall", "-Werror"],
+
    shared_libs: ["libcrypto"],
    static_libs: ["libfwdlock-common"],

--- a/drm/libdrmframework/plugins/forward-lock/internal-format/decoder/Android.bp
+++ b/drm/libdrmframework/plugins/forward-lock/internal-format/decoder/Android.bp
@ -19,6 +19,8 @@ cc_library_static {

    srcs: ["FwdLockFile.c"],

+    cflags: ["-Wall", "-Werror"],
+
    shared_libs: ["libcrypto"],
    static_libs: ["libfwdlock-common"],

--- a/drm/libdrmframework/plugins/passthru/Android.bp
+++ b/drm/libdrmframework/plugins/passthru/Android.bp
@ -32,5 +32,7 @@ cc_library_shared {
    cflags: [
        // Set the following flag to enable the decryption passthru flow
        //"-DENABLE_PASSTHRU_DECRYPTION",
+        "-Wall",
+        "-Werror",
    ],
 }
--- a/drm/mediadrm/plugins/clearkey/Android.bp
+++ b/drm/mediadrm/plugins/clearkey/Android.bp
@ -35,6 +35,8 @@ cc_library_shared {
    vendor: true,
    relative_install_path: "mediadrm",

+    cflags: ["-Wall", "-Werror"],
+
    shared_libs: [
        "libcrypto",
        "liblog",
--- a/drm/mediadrm/plugins/clearkey/tests/Android.bp
+++ b/drm/mediadrm/plugins/clearkey/tests/Android.bp
@ -21,6 +21,8 @@ cc_test {
    name: "ClearKeyDrmUnitTest",
    vendor: true,

+    cflags: ["-Wall", "-Werror"],
+
    srcs: [
        "AesCtrDecryptorUnittest.cpp",
        "InitDataParserUnittest.cpp",
--- a/drm/mediadrm/plugins/mock/Android.bp
+++ b/drm/mediadrm/plugins/mock/Android.bp
@ -30,5 +30,7 @@ cc_library_shared {
    cflags: [
        // Set the following flag to enable the decryption passthru flow
        //"-DENABLE_PASSTHRU_DECRYPTION",
+        "-Wall",
+        "-Werror",
    ],
 }
--- a/media/libstagefright/codecs/amrnb/dec/Android.bp
+++ b/media/libstagefright/codecs/amrnb/dec/Android.bp
@ -105,6 +105,8 @@ cc_test {

    srcs: ["test/amrnbdec_test.cpp"],

+    cflags: ["-Wall", "-Werror"],
+
    local_include_dirs: ["src"],

    static_libs: [
--- a/media/libstagefright/codecs/amrnb/enc/Android.bp
+++ b/media/libstagefright/codecs/amrnb/enc/Android.bp
@ -120,6 +120,8 @@ cc_test {

    srcs: ["test/amrnb_enc_test.cpp"],

+    cflags: ["-Wall", "-Werror"],
+
    local_include_dirs: ["src"],

    static_libs: ["libstagefright_amrnbenc"],
--- a/media/libstagefright/codecs/amrwb/Android.bp
+++ b/media/libstagefright/codecs/amrwb/Android.bp
@ -68,6 +68,8 @@ cc_test {

    srcs: ["test/amrwbdec_test.cpp"],

+    cflags: ["-Wall", "-Werror"],
+
    static_libs: [
        "libstagefright_amrwbdec",
        "libsndfile",
--- a/media/libstagefright/codecs/amrwbenc/SampleCode/Android.bp
+++ b/media/libstagefright/codecs/amrwbenc/SampleCode/Android.bp
@ -4,6 +4,8 @@ cc_test {

    srcs: ["AMRWB_E_SAMPLE.c"],

+    cflags: ["-Wall", "-Werror"],
+
    arch: {
        arm: {
            instruction_set: "arm",
--- a/media/libstagefright/codecs/avcdec/Android.bp
+++ b/media/libstagefright/codecs/avcdec/Android.bp
@ -4,6 +4,12 @@ cc_library_shared {
    static_libs: ["libavcdec"],
    srcs: ["SoftAVCDec.cpp"],

+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-unused-variable",
+    ],
+
    include_dirs: [
        "external/libavc/decoder",
        "external/libavc/common",
--- a/media/libstagefright/codecs/avcenc/Android.bp
+++ b/media/libstagefright/codecs/avcenc/Android.bp
@ -29,5 +29,10 @@ cc_library_shared {
        },
    },

+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-unused-variable",
+    ],
    ldflags: ["-Wl,-Bsymbolic"],
 }
--- a/media/libstagefright/codecs/hevcdec/Android.bp
+++ b/media/libstagefright/codecs/hevcdec/Android.bp
@ -4,6 +4,12 @@ cc_library_shared {
    static_libs: ["libhevcdec"],
    srcs: ["SoftHEVC.cpp"],

+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-unused-variable",
+    ],
+
    include_dirs: [
        "external/libhevc/decoder",
        "external/libhevc/common",
--- a/media/libstagefright/codecs/m4v_h263/enc/Android.bp
+++ b/media/libstagefright/codecs/m4v_h263/enc/Android.bp
@ -106,6 +106,8 @@ cc_test {
        "-DOSCL_EXPORT_REF=",
        "-DOSCL_IMPORT_REF=",
        "-DBX_RC",
+        "-Wall",
+        "-Werror",
    ],

    sanitize: {
--- a/media/libstagefright/codecs/mp3dec/Android.bp
+++ b/media/libstagefright/codecs/mp3dec/Android.bp
@ -122,6 +122,8 @@ cc_test {
        "test/mp3reader.cpp",
    ],

+    cflags: ["-Wall", "-Werror"],
+
    local_include_dirs: [
        "src",
        "include",
--- a/media/libstagefright/codecs/mpeg2dec/Android.bp
+++ b/media/libstagefright/codecs/mpeg2dec/Android.bp
@ -4,6 +4,12 @@ cc_library_shared {
    static_libs: ["libmpeg2dec"],
    srcs: ["SoftMPEG2.cpp"],

+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-unused-variable",
+    ],
+
    include_dirs: [
        "external/libmpeg2/decoder",
        "external/libmpeg2/common",
--- a/media/libstagefright/codecs/on2/enc/Android.bp
+++ b/media/libstagefright/codecs/on2/enc/Android.bp
@ -7,6 +7,8 @@ cc_library_shared {
        "SoftVP9Encoder.cpp",
    ],

+    cflags: ["-Wall", "-Werror"],
+
    include_dirs: [
        "frameworks/av/media/libstagefright/include",
        "frameworks/native/include/media/openmax",
--- a/media/libstagefright/codecs/on2/h264dec/Android.bp
+++ b/media/libstagefright/codecs/on2/h264dec/Android.bp
@ -96,6 +96,8 @@ cc_library_shared {
        },
    },

+    cflags: ["-Wall", "-Werror"],
+
    include_dirs: [
        "frameworks/av/media/libstagefright/include",
        "frameworks/native/include/media/openmax",
@ -133,5 +135,7 @@ cc_binary {

    srcs: ["source/DecTestBench.c"],

+    cflags: ["-Wall", "-Werror"],
+
    shared_libs: ["libstagefright_soft_h264dec"],
 }
--- a/media/libstagefright/codecs/opus/dec/Android.bp
+++ b/media/libstagefright/codecs/opus/dec/Android.bp
@ -17,6 +17,8 @@ cc_library_shared {
        "liblog",
    ],

+    cflags: ["-Werror"],
+
    sanitize: {
        misc_undefined: [
            "signed-integer-overflow",
--- a/media/libstagefright/omx/Android.bp
+++ b/media/libstagefright/omx/Android.bp
@ -99,6 +99,7 @@ cc_library_static {
            cfi: true,
        },
    },
+    cflags: ["-Wall", "-Werror"],
 }

 //###############################################################################