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

Commit dc306be2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove ndk_platform backend. Use the ndk backend." into... 

Merge "Remove ndk_platform backend. Use the ndk backend." into sc-dev-plus-aosp am: 5e654313 am: bc35718b

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

Change-Id: If0cb1a754159ee2a2b0cc669abf9b4e6eef025a1
parents 5b55235b bc35718b

drm/libmediadrm/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ cc_library { 
    ],



    static_libs: [

        "resourcemanager_aidl_interface-ndk_platform",

        "resourcemanager_aidl_interface-ndk",

    ],



    export_shared_lib_headers: [

drm/libmediadrm/fuzzer/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ cc_fuzz { 
    static_libs: [

        "libmediadrm",

        "liblog",

        "resourcemanager_aidl_interface-ndk_platform",

        "resourcemanager_aidl_interface-ndk",

    ],

    header_libs: [

        "libmedia_headers",

media/libmedia/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -378,12 +378,12 @@ cc_library { 
    ],



    static_libs: [

        "resourcemanager_aidl_interface-ndk_platform",

        "resourcemanager_aidl_interface-ndk",

        "framework-permission-aidl-cpp",

    ],



    export_static_lib_headers: [

        "resourcemanager_aidl_interface-ndk_platform",

        "resourcemanager_aidl_interface-ndk",

        "framework-permission-aidl-cpp",

    ],

media/libmediaplayerservice/tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ cc_test { 
    ],



    static_libs: [

        "resourcemanager_aidl_interface-ndk_platform",

        "resourcemanager_aidl_interface-ndk",

    ],



    include_dirs: [

media/libmediatranscoding/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -106,8 +106,8 @@ cc_library { 
    export_include_dirs: ["include"],



    static_libs: [

        "mediatranscoding_aidl_interface-ndk_platform",

        "resourceobserver_aidl_interface-V1-ndk_platform",

        "mediatranscoding_aidl_interface-ndk",

        "resourceobserver_aidl_interface-V1-ndk",

        "libstatslog_media",

    ],