commit 2cb7dcf688805a07fa44f6bec84cad883061a059
author Cindy Zhou <zhouci@google.com> Wed Jan 20 22:54:12 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 20 22:54:12 2021 +0000
tree bfd7172c7070195fe28bae6276a4c97224f66aef
parent f9e31dbc3cb72891192a156546f54561f8edb3dd
parent 6a56a14e7d6e72ff188477a55621fc0c59618b11

Merge "Enable cfi in hevc library" am: 6a56a14e7d

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1551236

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80934ee94a080dc529b3dc39efa31ef3175d03df

media/codec2/components/hevc/Android.bp

diff --git a/media/codec2/components/hevc/Android.bp b/media/codec2/components/hevc/Android.bp
index 2858212..1be0cfc 100644
--- a/media/codec2/components/hevc/Android.bp
+++ b/media/codec2/components/hevc/Android.bp
@@ -3,6 +3,7 @@
     defaults: [
         "libcodec2_soft-defaults",
         "libcodec2_soft_sanitize_signed-defaults",
+        "libcodec2_soft_sanitize_cfi-defaults",
     ],
 
     srcs: ["C2SoftHevcDec.cpp"],
@@ -16,6 +17,7 @@
     defaults: [
         "libcodec2_soft-defaults",
         "libcodec2_soft_sanitize_signed-defaults",
+        "libcodec2_soft_sanitize_cfi-defaults",
     ],
 
     srcs: ["C2SoftHevcEnc.cpp"],

media/libstagefright/codecs/hevcdec/Android.bp

diff --git a/media/libstagefright/codecs/hevcdec/Android.bp b/media/libstagefright/codecs/hevcdec/Android.bp
index ec436ce..ffad18c 100644
--- a/media/libstagefright/codecs/hevcdec/Android.bp
+++ b/media/libstagefright/codecs/hevcdec/Android.bp
@@ -17,6 +17,9 @@
             "signed-integer-overflow",
         ],
         cfi: true,
+        config: {
+            cfi_assembly_support: true,
+        },
     },
 
     // We need this because the current asm generates the following link error: