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

Commit 88fd5247 authored by Colin Cross's avatar Colin Cross
Browse files

Rearrange opengl llndk libraries to be next to implementations 

As an intermediate step towards removing llndk_library modules in
favor of using llndk properties in the cc_library directly, move the
llndk_library modules next to the cc_library modules so that the
paths in the llndk_library properites are correct when Soong copies
the properties into the cc_library module.

Bug: 170784825
Test: m checkbuild
Change-Id: I41674ad253b009d1cf528dc7b480676fb29edabd
parent 4694d14a

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"],

}