Merge "Enable cfi in hevc library" am: b31c795682 am: 1e11774fd2 am: a773e248dd
Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1515852
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If69c2da243f06e2eadbc90d1f51070380a87d0f2
diff --git a/media/codec2/components/hevc/Android.bp b/media/codec2/components/hevc/Android.bp
index 2858212..dcd4901 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 ec436ce..392396c 100644
--- a/media/libstagefright/codecs/hevcdec/Android.bp
+++ b/media/libstagefright/codecs/hevcdec/Android.bp
@@ -17,6 +17,13 @@
"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: