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

Commit d3c58eb7 authored by Dan Albert's avatar Dan Albert Committed by android-build-merger
Browse files

Merge "Unversion NDK stub libraries." am: 3944ec42 am: ce80f3f4 am: e6545f3c 

am: d956830c

Change-Id: Iacf84cc03329107602643009d143c2211b97398d
parents dfb2b9bd d956830c

opengl/libs/Android.bp

+4 −3
Original line number Diff line number Diff line
@@ -26,27 +26,28 @@ ndk_library { 
    name: "libEGL.ndk",

    symbol_file: "libEGL.map.txt",

    first_version: "9",

    unversioned_until: "current",

}



ndk_library {

    name: "libGLESv1_CM.ndk",

    symbol_file: "libGLESv1_CM.map.txt",

    first_version: "9",

    unversioned_until: "current",

}



ndk_library {

    name: "libGLESv2.ndk",

    symbol_file: "libGLESv2.map.txt",

    first_version: "9",

    unversioned_until: "current",

}



ndk_library {

    name: "libGLESv3.ndk",

    symbol_file: "libGLESv3.map.txt",

    first_version: "18",



    // https://github.com/android-ndk/ndk/issues/265

    unversioned_until: "24",

    unversioned_until: "current",

}



cc_defaults {

vulkan/libvulkan/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ ndk_library { 
    name: "libvulkan.ndk",

    symbol_file: "libvulkan.map.txt",

    first_version: "24",

    unversioned_until: "current",

}



cc_library_shared {