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

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

Merge changes I8e6aa7a1,Ie50784b5 am: 6d077bf3 

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



Change-Id: I5c433a9edb0a7763452a2940a59547287b8aa39c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f4f832e 6d077bf3

media/libstagefright/Android.bp

+0 −37
Original line number Diff line number Diff line
@@ -33,43 +33,6 @@ cc_library_headers { 
    },

}



cc_library_static {

    name: "libstagefright_metadatautils",

    apex_available: [

        "//apex_available:platform",

        "com.android.media",

    ],

    min_sdk_version: "29",



    srcs: ["MetaDataUtils.cpp"],



    cflags: [

        "-Werror",

        "-Wall",

    ],

    sanitize: {

        misc_undefined: [

            "signed-integer-overflow",

        ],

        cfi: true,

    },



    header_libs: [

        "libaudioclient_headers",

        "libstagefright_foundation_headers",

        "media_ndk_headers",

    ],



    host_supported: true,

    target: {

        darwin: {

            enabled: false,

        },

    },



    export_include_dirs: ["include"],

}



cc_library_shared {

    name: "libstagefright_codecbase",

media/module/metadatautils/Android.bp

0 → 100644
+37 −0
Original line number Diff line number Diff line 
cc_library_static {

    name: "libstagefright_metadatautils",

    apex_available: [

        "//apex_available:platform",

        "com.android.media",

    ],

    min_sdk_version: "29",



    srcs: ["MetaDataUtils.cpp"],



    cflags: [

        "-Werror",

        "-Wall",

    ],

    sanitize: {

        misc_undefined: [

            "signed-integer-overflow",

        ],

        cfi: true,

    },



    header_libs: [

        "libaudioclient_headers",

        "libstagefright_headers",

        "libstagefright_foundation_headers",

        "media_ndk_headers",

    ],



    host_supported: true,

    target: {

        darwin: {

            enabled: false,

        },

    },



    export_include_dirs: ["include"],

}

media/libstagefright/tests/metadatautils/Android.bp→media/module/metadatautils/test/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ package { 
    // all of the 'license_kinds' from "frameworks_av_media_libstagefright_tests_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: [

        "frameworks_av_media_libstagefright_tests_license",

    ],

}



cc_test {