Merge "Revert "Enable cfi in hevc library"" am: cd13efa9d8
Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1546595
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I93bdce1b5e6d4e8f7af92c93a9b4b05ef19c756b
diff --git a/media/codec2/components/hevc/Android.bp b/media/codec2/components/hevc/Android.bp
index dcd4901..2858212 100644
--- a/media/codec2/components/hevc/Android.bp
+++ b/media/codec2/components/hevc/Android.bp
@@ -3,12 +3,12 @@
defaults: [
"libcodec2_soft-defaults",
"libcodec2_soft_sanitize_signed-defaults",
- "libcodec2_soft_sanitize_cfi-defaults",
],
srcs: ["C2SoftHevcDec.cpp"],
static_libs: ["libhevcdec"],
+
}
cc_library {
@@ -16,10 +16,10 @@
defaults: [
"libcodec2_soft-defaults",
"libcodec2_soft_sanitize_signed-defaults",
- "libcodec2_soft_sanitize_cfi-defaults",
],
srcs: ["C2SoftHevcEnc.cpp"],
static_libs: ["libhevcenc"],
+
}
diff --git a/media/libstagefright/codecs/hevcdec/Android.bp b/media/libstagefright/codecs/hevcdec/Android.bp
index 392396c..ec436ce 100644
--- a/media/libstagefright/codecs/hevcdec/Android.bp
+++ b/media/libstagefright/codecs/hevcdec/Android.bp
@@ -17,13 +17,6 @@
"signed-integer-overflow",
],
cfi: true,
- diag: {
- cfi: true,
- },
- config: {
- cfi_assembly_support: true,
- },
-
},
// We need this because the current asm generates the following link error: