Merge "Remove CFI diagnostics." am: 64ac8c6301 am: b89b976d77

am: 6671ea8a46 Change-Id: I4de33cfd8451cceab9ca234d884522e6e9489b08
6 years ago · df7d3e0876
parent 0209452544 6671ea8a46
commit df7d3e0876
51 changed files with 0 additions and 201 deletions
--- a/media/extractors/aac/Android.bp
+++ b/media/extractors/aac/Android.bp
@ -36,9 +36,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
            "signed-integer-overflow",
        ],
-        diag: {
-            cfi: true,
-        },
    },

 }
--- a/media/extractors/amr/Android.bp
+++ b/media/extractors/amr/Android.bp
@ -34,9 +34,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
            "signed-integer-overflow",
        ],
-        diag: {
-            cfi: true,
-        },
    },

 }
--- a/media/extractors/flac/Android.bp
+++ b/media/extractors/flac/Android.bp
@ -40,9 +40,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
            "signed-integer-overflow",
        ],
-        diag: {
-            cfi: true,
-        },
    },

 }
--- a/media/extractors/midi/Android.bp
+++ b/media/extractors/midi/Android.bp
@ -35,9 +35,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
            "signed-integer-overflow",
        ],
-        diag: {
-            cfi: true,
-        },
    },

 }
--- a/media/extractors/mkv/Android.bp
+++ b/media/extractors/mkv/Android.bp
@ -41,9 +41,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
            "signed-integer-overflow",
        ],
-        diag: {
-            cfi: true,
-        },
    },

 }
--- a/media/extractors/mp3/Android.bp
+++ b/media/extractors/mp3/Android.bp
@ -40,9 +40,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
            "signed-integer-overflow",
        ],
-        diag: {
-            cfi: true,
-        },
    },

 }
--- a/media/extractors/mp4/Android.bp
+++ b/media/extractors/mp4/Android.bp
@ -48,9 +48,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
            "signed-integer-overflow",
        ],
-        diag: {
-            cfi: true,
-        },
    },

 }
--- a/media/extractors/mpeg2/Android.bp
+++ b/media/extractors/mpeg2/Android.bp
@ -52,9 +52,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
            "signed-integer-overflow",
        ],
-        diag: {
-            cfi: true,
-        },
    },

 }
--- a/media/extractors/ogg/Android.bp
+++ b/media/extractors/ogg/Android.bp
@ -38,9 +38,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
            "signed-integer-overflow",
        ],
-        diag: {
-            cfi: true,
-        },
    },

 }
--- a/media/extractors/wav/Android.bp
+++ b/media/extractors/wav/Android.bp
@ -37,9 +37,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
            "signed-integer-overflow",
        ],
-        diag: {
-            cfi: true,
-        },
    },

 }
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@ -113,9 +113,6 @@ cc_library_shared {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }

@ -144,9 +141,6 @@ cc_library_static {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }

@ -267,9 +261,6 @@ cc_library {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }

@ -331,8 +322,5 @@ cc_library_static {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }
--- a/media/libmediaextractor/Android.bp
+++ b/media/libmediaextractor/Android.bp
@ -48,8 +48,5 @@ cc_library {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }
--- a/media/libmediametrics/Android.bp
+++ b/media/libmediametrics/Android.bp
@ -31,8 +31,5 @@ cc_library {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }
--- a/media/libmediaplayer2/Android.bp
+++ b/media/libmediaplayer2/Android.bp
@ -78,9 +78,6 @@ cc_library_static {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }

--- a/media/libmediaplayer2/nuplayer2/Android.bp
+++ b/media/libmediaplayer2/nuplayer2/Android.bp
@ -66,9 +66,6 @@ cc_library_static {

    sanitize: {
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

 }
--- a/media/libmediaplayerservice/Android.bp
+++ b/media/libmediaplayerservice/Android.bp
@ -68,9 +68,6 @@ cc_library_shared {

    sanitize: {
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

 }
--- a/media/libmediaplayerservice/nuplayer/Android.bp
+++ b/media/libmediaplayerservice/nuplayer/Android.bp
@ -56,9 +56,6 @@ cc_library_static {

    sanitize: {
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

 }
--- a/media/libstagefright/Android.bp
+++ b/media/libstagefright/Android.bp
@ -18,9 +18,6 @@ cc_library_static {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    shared_libs: ["libmedia"],
@ -40,9 +37,6 @@ cc_library_static {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    shared_libs: ["libmedia", "libmediandk"],
@ -80,9 +74,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
            "signed-integer-overflow",
        ],
-        diag: {
-            cfi: true,
-        },
    },
 }

@ -234,9 +225,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
            "signed-integer-overflow",
        ],
-        diag: {
-            cfi: true,
-        },
    },
 }

@ -291,9 +279,6 @@ cc_library_static {
            "unsigned-integer-overflow",
            "signed-integer-overflow",
        ],
-        diag: {
-            cfi: true,
-        },
    },
 }

--- a/media/libstagefright/bqhelper/Android.bp
+++ b/media/libstagefright/bqhelper/Android.bp
@ -61,8 +61,5 @@ cc_library_shared {
            "unsigned-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }
--- a/media/libstagefright/codecs/aacdec/Android.bp
+++ b/media/libstagefright/codecs/aacdec/Android.bp
@ -25,9 +25,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    static_libs: ["libFraunhoferAAC"],
--- a/media/libstagefright/codecs/aacenc/Android.bp
+++ b/media/libstagefright/codecs/aacenc/Android.bp
@ -22,9 +22,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    static_libs: ["libFraunhoferAAC"],
--- a/media/libstagefright/codecs/amrwbenc/Android.bp
+++ b/media/libstagefright/codecs/amrwbenc/Android.bp
@ -134,9 +134,6 @@ cc_library_static {
    cflags: ["-Werror"],
    sanitize: {
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

 }
@ -166,9 +163,6 @@ cc_library_shared {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    static_libs: ["libstagefright_amrwbenc"],
--- a/media/libstagefright/codecs/amrwbenc/SampleCode/Android.bp
+++ b/media/libstagefright/codecs/amrwbenc/SampleCode/Android.bp
@ -23,8 +23,5 @@ cc_test {

    sanitize: {
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }
--- a/media/libstagefright/codecs/avcdec/Android.bp
+++ b/media/libstagefright/codecs/avcdec/Android.bp
@ -34,9 +34,6 @@ cc_library_shared {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    ldflags: ["-Wl,-Bsymbolic"],
--- a/media/libstagefright/codecs/avcenc/Android.bp
+++ b/media/libstagefright/codecs/avcenc/Android.bp
@ -28,9 +28,6 @@ cc_library_shared {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    cflags: [
--- a/media/libstagefright/codecs/flac/dec/Android.bp
+++ b/media/libstagefright/codecs/flac/dec/Android.bp
@ -26,9 +26,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    shared_libs: [
--- a/media/libstagefright/codecs/flac/enc/Android.bp
+++ b/media/libstagefright/codecs/flac/enc/Android.bp
@ -18,9 +18,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    shared_libs: [
--- a/media/libstagefright/codecs/g711/dec/Android.bp
+++ b/media/libstagefright/codecs/g711/dec/Android.bp
@ -29,9 +29,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
    compile_multilib: "32",
 }
--- a/media/libstagefright/codecs/gsm/dec/Android.bp
+++ b/media/libstagefright/codecs/gsm/dec/Android.bp
@ -23,9 +23,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    shared_libs: [
--- a/media/libstagefright/codecs/hevcdec/Android.bp
+++ b/media/libstagefright/codecs/hevcdec/Android.bp
@ -28,9 +28,6 @@ cc_library_shared {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    shared_libs: [
--- a/media/libstagefright/codecs/m4v_h263/dec/Android.bp
+++ b/media/libstagefright/codecs/m4v_h263/dec/Android.bp
@ -60,9 +60,6 @@ cc_library_static {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }

@ -106,9 +103,6 @@ cc_library_shared {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
    compile_multilib: "32",
 }
--- a/media/libstagefright/codecs/m4v_h263/enc/Android.bp
+++ b/media/libstagefright/codecs/m4v_h263/enc/Android.bp
@ -44,9 +44,6 @@ cc_library_static {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }

@ -92,9 +89,6 @@ cc_library_shared {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
    compile_multilib: "32",
 }
@ -122,9 +116,6 @@ cc_test {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    static_libs: ["libstagefright_m4vh263enc"],
--- a/media/libstagefright/codecs/mp3dec/Android.bp
+++ b/media/libstagefright/codecs/mp3dec/Android.bp
@ -59,9 +59,6 @@ cc_library_static {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    include_dirs: ["frameworks/av/media/libstagefright/include"],
@ -106,9 +103,6 @@ cc_library_shared {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    shared_libs: [
@ -144,9 +138,6 @@ cc_test {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    static_libs: [
--- a/media/libstagefright/codecs/mpeg2dec/Android.bp
+++ b/media/libstagefright/codecs/mpeg2dec/Android.bp
@ -34,9 +34,6 @@ cc_library_shared {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
    compile_multilib: "32",
 }
--- a/media/libstagefright/codecs/on2/dec/Android.bp
+++ b/media/libstagefright/codecs/on2/dec/Android.bp
@ -31,9 +31,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
    compile_multilib: "32",
 }
--- a/media/libstagefright/codecs/on2/enc/Android.bp
+++ b/media/libstagefright/codecs/on2/enc/Android.bp
@ -26,9 +26,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    static_libs: ["libvpx"],
--- a/media/libstagefright/codecs/opus/dec/Android.bp
+++ b/media/libstagefright/codecs/opus/dec/Android.bp
@ -30,9 +30,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
    compile_multilib: "32",
 }
--- a/media/libstagefright/codecs/raw/Android.bp
+++ b/media/libstagefright/codecs/raw/Android.bp
@ -22,9 +22,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    shared_libs: [
--- a/media/libstagefright/colorconversion/Android.bp
+++ b/media/libstagefright/colorconversion/Android.bp
@ -24,8 +24,5 @@ cc_library_static {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }
--- a/media/libstagefright/filters/Android.bp
+++ b/media/libstagefright/filters/Android.bp
@ -31,8 +31,5 @@ cc_library_static {

    sanitize: {
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }
--- a/media/libstagefright/flac/dec/Android.bp
+++ b/media/libstagefright/flac/dec/Android.bp
@ -24,9 +24,6 @@ cc_library {
            "unsigned-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    static: {
--- a/media/libstagefright/foundation/Android.bp
+++ b/media/libstagefright/foundation/Android.bp
@ -79,8 +79,5 @@ cc_library {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }
--- a/media/libstagefright/http/Android.bp
+++ b/media/libstagefright/http/Android.bp
@ -29,9 +29,6 @@ cc_library_shared {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    product_variables: {
--- a/media/libstagefright/httplive/Android.bp
+++ b/media/libstagefright/httplive/Android.bp
@ -25,9 +25,6 @@ cc_library {
            "unsigned-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    shared_libs: [
--- a/media/libstagefright/id3/Android.bp
+++ b/media/libstagefright/id3/Android.bp
@ -16,9 +16,6 @@ cc_library_static {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }

@ -47,9 +44,6 @@ cc_test {

    sanitize: {
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

 }
--- a/media/libstagefright/mpeg2ts/Android.bp
+++ b/media/libstagefright/mpeg2ts/Android.bp
@ -25,9 +25,6 @@ cc_library_static {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    shared_libs: [
--- a/media/libstagefright/omx/Android.bp
+++ b/media/libstagefright/omx/Android.bp
@ -79,9 +79,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }

@ -115,9 +112,6 @@ cc_library_shared {
            "unsigned-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
    cflags: ["-Wall", "-Werror"],
 }
--- a/media/libstagefright/rtsp/Android.bp
+++ b/media/libstagefright/rtsp/Android.bp
@ -46,9 +46,6 @@ cc_defaults {
            "unsigned-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }

@ -104,8 +101,5 @@ cc_test {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }
--- a/media/libstagefright/timedtext/Android.bp
+++ b/media/libstagefright/timedtext/Android.bp
@ -14,9 +14,6 @@ cc_library_static {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    include_dirs: [
--- a/media/libstagefright/webm/Android.bp
+++ b/media/libstagefright/webm/Android.bp
@ -14,9 +14,6 @@ cc_library_static {
            "unsigned-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

    srcs: [
--- a/media/libstagefright/xmlparser/Android.bp
+++ b/media/libstagefright/xmlparser/Android.bp
@ -36,9 +36,6 @@ cc_library_shared {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

 }