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

Commit a85def66 authored by Orion Hodson's avatar Orion Hodson Committed by Automerger Merge Worker
Browse files

Merge "Add explicit dependencies on jni_headers" am: ada7c446 

Change-Id: I67c4f7a6c55a5d588a987890f01618668018c9dd
parents 2beb1ded ada7c446

media/libmedia/Android.bp

+2 −0
Original line number Original line Diff line number Diff line
@@ -282,11 +282,13 @@ cc_library { 
        "bionic_libc_platform_headers",

        "bionic_libc_platform_headers",

        "libstagefright_headers",

        "libstagefright_headers",

        "media_ndk_headers",

        "media_ndk_headers",

        "jni_headers",

    ],

    ],





    export_header_lib_headers: [

    export_header_lib_headers: [

        "libstagefright_headers",

        "libstagefright_headers",

        "media_ndk_headers",

        "media_ndk_headers",

        "jni_headers",

    ],

    ],





    shared_libs: [

    shared_libs: [

media/ndk/Android.bp

+3 −0
Original line number Original line Diff line number Diff line
@@ -70,6 +70,7 @@ cc_library_shared { 
    ],

    ],





    header_libs: [

    header_libs: [

        "jni_headers",

        "libmediadrm_headers",

        "libmediadrm_headers",

    ],

    ],
@@ -97,6 +98,8 @@ cc_library_shared { 
        "libmediandk_utils",

        "libmediandk_utils",

    ],

    ],





    export_header_lib_headers: ["jni_headers"],



    export_include_dirs: ["include"],

    export_include_dirs: ["include"],





    export_shared_lib_headers: [

    export_shared_lib_headers: [