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

Commit a59e1fdb authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Make the connection between implementation and llndk_library explicit"... 

Merge "Make the connection between implementation and llndk_library explicit" am: 1aba8aec am: 11bead39

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1466883

Change-Id: Ia898edfae11519d81850eca6077b48df1c937e6a
parents b932d1c7 11bead39

libs/binder/ndk/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ cc_library { 
    defaults: ["libbinder_ndk_host_user"],

    host_supported: true,



    llndk_stubs: "libbinder_ndk.llndk",



    export_include_dirs: [

        "include_cpp",

        "include_ndk",
@@ -120,7 +122,7 @@ ndk_library { 
}



llndk_library {

    name: "libbinder_ndk",

    name: "libbinder_ndk.llndk",

    symbol_file: "libbinder_ndk.map.txt",

    export_include_dirs: [

        "include_cpp",

libs/nativewindow/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ ndk_library { 


cc_library {

    name: "libnativewindow",

    llndk_stubs: "libnativewindow.llndk",

    export_include_dirs: [

        "include",

        "include-private",
@@ -95,7 +96,7 @@ cc_library { 
}



llndk_library {

    name: "libnativewindow",

    name: "libnativewindow.llndk",

    symbol_file: "libnativewindow.map.txt",

    unversioned: true,

    export_include_dirs: ["include"],

opengl/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -53,25 +53,25 @@ ndk_headers { 
}



llndk_library {

    name: "libEGL",

    name: "libEGL.llndk",

    symbol_file: "libs/libEGL.map.txt",

    export_include_dirs: ["include"],

}



llndk_library {

    name: "libGLESv1_CM",

    name: "libGLESv1_CM.llndk",

    symbol_file: "libs/libGLESv1_CM.map.txt",

    export_include_dirs: ["include"],

}



llndk_library {

    name: "libGLESv2",

    name: "libGLESv2.llndk",

    symbol_file: "libs/libGLESv2.map.txt",

    export_include_dirs: ["include"],

}



llndk_library {

    name: "libGLESv3",

    name: "libGLESv3.llndk",

    symbol_file: "libs/libGLESv3.map.txt",

    export_include_dirs: ["include"],

}

opengl/libs/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ cc_library_static { 
cc_library_shared {

    name: "libEGL",

    defaults: ["egl_libs_defaults"],

    llndk_stubs: "libEGL.llndk",

    srcs: [

        "EGL/egl_tls.cpp",

        "EGL/egl_cache.cpp",
@@ -198,6 +199,7 @@ cc_defaults { 
cc_library_shared {

    name: "libGLESv1_CM",

    defaults: ["gles_libs_defaults"],

    llndk_stubs: "libGLESv1_CM.llndk",

    srcs: ["GLES_CM/gl.cpp"],

    cflags: ["-DLOG_TAG=\"libGLESv1\""],

    version_script: "libGLESv1_CM.map.txt",
@@ -209,6 +211,7 @@ cc_library_shared { 
cc_library_shared {

    name: "libGLESv2",

    defaults: ["gles_libs_defaults"],

    llndk_stubs: "libGLESv2.llndk",

    srcs: ["GLES2/gl2.cpp"],

    cflags: ["-DLOG_TAG=\"libGLESv2\""],
@@ -223,6 +226,7 @@ cc_library_shared { 
cc_library_shared {

    name: "libGLESv3",

    defaults: ["gles_libs_defaults"],

    llndk_stubs: "libGLESv3.llndk",

    srcs: ["GLES2/gl2.cpp"],

    cflags: ["-DLOG_TAG=\"libGLESv3\""],

}

vulkan/libvulkan/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ ndk_library { 
}



llndk_library {

    name: "libvulkan",

    name: "libvulkan.llndk",

    symbol_file: "libvulkan.map.txt",

    export_llndk_headers: [

        "vulkan_headers_llndk",
@@ -30,6 +30,7 @@ llndk_library { 


cc_library_shared {

    name: "libvulkan",

    llndk_stubs: "libvulkan.llndk",

    clang: true,

    sanitize: {

        misc_undefined: ["integer"],