Merge "Remove CFI diagnostics."

5 years ago · a6d5e8b33c
parent 8ec576b7ab e5cd43c99e
commit a6d5e8b33c
3 changed files with 0 additions and 15 deletions
--- a/media/codec2/components/base/Android.bp
+++ b/media/codec2/components/base/Android.bp
@ -74,9 +74,6 @@ cc_defaults {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }

@ -90,9 +87,6 @@ cc_defaults {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },
 }

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

    ldflags: ["-Wl,-Bsymbolic"],
--- a/media/libmediaplayer2/Android.bp
+++ b/media/libmediaplayer2/Android.bp
@ -123,9 +123,6 @@ cc_library {
            "signed-integer-overflow",
        ],
        cfi: true,
-        diag: {
-            cfi: true,
-        },
    },

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

    include_dirs: [