Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b13f4395 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "codec2,aom/Android.bp: add libcodec2_soft_sanitize_cfi" into main am:...

Merge "codec2,aom/Android.bp: add libcodec2_soft_sanitize_cfi" into main am: 71a4703a am: 9bffbb1c

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



Change-Id: Id81ba7b3b573772af24b061c487afad565176745
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c3ddf207 9bffbb1c
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ cc_library {
    defaults: [
        "libcodec2_soft-defaults",
        "libcodec2_soft_sanitize_all-defaults",
        "libcodec2_soft_sanitize_cfi-defaults",
    ],

    // coordinated with frameworks/av/media/codec2/components/gav1/Android.bp
@@ -29,6 +30,7 @@ cc_library {
    defaults: [
        "libcodec2_soft-defaults",
        "libcodec2_soft_sanitize_all-defaults",
        "libcodec2_soft_sanitize_cfi-defaults",
    ],

    static_libs: ["libaom"],