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

Commit 219db6cb authored by Dan Willemsen's avatar Dan Willemsen Committed by Steven Moreland
Browse files

Remove .(ll)ndk suffix from (ll)ndk_library 

Soong handles these automatically now.

Bug: 33241851
Test: Android-aosp_arm.mk is the same before/after
Test: build.ninja is the same before/after
Test: build-aosp_arm.ninja is the same before/after
Change-Id: Ie1cd267564095c51e536b7a84d53e7aed9dca288
parent ed7bc4a6

opengl/libs/Android.bp

+4 −4
Original line number Original line Diff line number Diff line
@@ -23,28 +23,28 @@ cc_library { 




// The headers modules are in frameworks/native/opengl/Android.bp.

// The headers modules are in frameworks/native/opengl/Android.bp.

ndk_library {

ndk_library {

    name: "libEGL.ndk",

    name: "libEGL",

    symbol_file: "libEGL.map.txt",

    symbol_file: "libEGL.map.txt",

    first_version: "9",

    first_version: "9",

    unversioned_until: "current",

    unversioned_until: "current",

}

}





ndk_library {

ndk_library {

    name: "libGLESv1_CM.ndk",

    name: "libGLESv1_CM",

    symbol_file: "libGLESv1_CM.map.txt",

    symbol_file: "libGLESv1_CM.map.txt",

    first_version: "9",

    first_version: "9",

    unversioned_until: "current",

    unversioned_until: "current",

}

}





ndk_library {

ndk_library {

    name: "libGLESv2.ndk",

    name: "libGLESv2",

    symbol_file: "libGLESv2.map.txt",

    symbol_file: "libGLESv2.map.txt",

    first_version: "9",

    first_version: "9",

    unversioned_until: "current",

    unversioned_until: "current",

}

}





ndk_library {

ndk_library {

    name: "libGLESv3.ndk",

    name: "libGLESv3",

    symbol_file: "libGLESv3.map.txt",

    symbol_file: "libGLESv3.map.txt",

    first_version: "18",

    first_version: "18",

    unversioned_until: "current",

    unversioned_until: "current",

vulkan/libvulkan/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 




// Headers module is in frameworks/native/vulkan/Android.bp.

// Headers module is in frameworks/native/vulkan/Android.bp.

ndk_library {

ndk_library {

    name: "libvulkan.ndk",

    name: "libvulkan",

    symbol_file: "libvulkan.map.txt",

    symbol_file: "libvulkan.map.txt",

    first_version: "24",

    first_version: "24",

    unversioned_until: "current",

    unversioned_until: "current",