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

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

Merge "Remove llndk_headers module" am: aaf8e170 am: b86e54d2 

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

Change-Id: I0a6462d9bcaa84bb45b2c91f0ceb518102fd889f
parents 458e9c61 b86e54d2

opengl/Android.bp

+3 −5
Original line number Diff line number Diff line
@@ -68,11 +68,9 @@ cc_library_headers { 
    name: "gl_headers",

    vendor_available: true,

    export_include_dirs: ["include"],

}



llndk_headers {

    name: "gl_llndk_headers",

    export_include_dirs: ["include"],

    llndk: {

        llndk_headers: true,

    },

}



subdirs = [

opengl/libs/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ cc_library_shared { 
    defaults: ["egl_libs_defaults"],

    llndk: {

        symbol_file: "libEGL.map.txt",

        export_llndk_headers: ["gl_llndk_headers"],

        export_llndk_headers: ["gl_headers"],

        // Don't export EGL/include from the LLNDK variant.

        override_export_include_dirs: [],

    },
@@ -215,7 +215,7 @@ cc_library_shared { 
    defaults: ["gles_libs_defaults"],

    llndk: {

        symbol_file: "libGLESv1_CM.map.txt",

        export_llndk_headers: ["gl_llndk_headers"],

        export_llndk_headers: ["gl_headers"],

        // Don't export EGL/include from the LLNDK variant.

        override_export_include_dirs: [],

    },
@@ -232,7 +232,7 @@ cc_library_shared { 
    defaults: ["gles_libs_defaults"],

    llndk: {

        symbol_file: "libGLESv2.map.txt",

        export_llndk_headers: ["gl_llndk_headers"],

        export_llndk_headers: ["gl_headers"],

        // Don't export EGL/include from the LLNDK variant.

        override_export_include_dirs: [],

    },
@@ -252,7 +252,7 @@ cc_library_shared { 
    defaults: ["gles_libs_defaults"],

    llndk: {

        symbol_file: "libGLESv3.map.txt",

        export_llndk_headers: ["gl_llndk_headers"],

        export_llndk_headers: ["gl_headers"],

        // Don't export EGL/include from the LLNDK variant.

        override_export_include_dirs: [],

    },

vulkan/libvulkan/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ cc_library_shared { 
    llndk: {

        symbol_file: "libvulkan.map.txt",

        export_llndk_headers: [

            "vulkan_headers_llndk",

            "vulkan_headers",

        ],

    },

    clang: true,