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

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

Merge "Rearrange opengl llndk libraries to be next to implementations" am:... 

Merge "Rearrange opengl llndk libraries to be next to implementations" am: 64618017 am: 1fd5529a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia32c642c432545d93c9f5efb72a639621f540675
parents 39e6a2c4 1fd5529a

opengl/Android.bp

+5 −24
Original line number Diff line number Diff line
@@ -52,36 +52,17 @@ ndk_headers { 
    license: "include/KHR/NOTICE",

}



llndk_library {

    name: "libEGL.llndk",

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

    export_include_dirs: ["include"],

}



llndk_library {

    name: "libGLESv1_CM.llndk",

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

    export_include_dirs: ["include"],

}



llndk_library {

    name: "libGLESv2.llndk",

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

    export_include_dirs: ["include"],

}



llndk_library {

    name: "libGLESv3.llndk",

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

    export_include_dirs: ["include"],

}



cc_library_headers {

    name: "gl_headers",

    vendor_available: true,

    export_include_dirs: ["include"],

}



llndk_headers {

    name: "gl_llndk_headers",

    export_include_dirs: ["include"],

}



subdirs = [

    "*",

]

opengl/libs/Android.bp

+24 −0
Original line number Diff line number Diff line
@@ -230,3 +230,27 @@ cc_library_shared { 
    srcs: ["GLES2/gl2.cpp"],

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

}



llndk_library {

    name: "libEGL.llndk",

    symbol_file: "libEGL.map.txt",

    export_llndk_headers: ["gl_llndk_headers"],

}



llndk_library {

    name: "libGLESv1_CM.llndk",

    symbol_file: "libGLESv1_CM.map.txt",

    export_llndk_headers: ["gl_llndk_headers"],

}



llndk_library {

    name: "libGLESv2.llndk",

    symbol_file: "libGLESv2.map.txt",

    export_llndk_headers: ["gl_llndk_headers"],

}



llndk_library {

    name: "libGLESv3.llndk",

    symbol_file: "libGLESv3.map.txt",

    export_llndk_headers: ["gl_llndk_headers"],

}