diff options
| -rw-r--r-- | opengl/Android.bp | 8 | ||||
| -rw-r--r-- | opengl/libs/Android.bp | 8 | ||||
| -rw-r--r-- | vulkan/libvulkan/Android.bp | 2 |
3 files changed, 8 insertions, 10 deletions
diff --git a/opengl/Android.bp b/opengl/Android.bp index 748f7953c9..16ce15b2f7 100644 --- a/opengl/Android.bp +++ b/opengl/Android.bp @@ -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 = [ diff --git a/opengl/libs/Android.bp b/opengl/libs/Android.bp index 6d59ac02f2..daaaf88bbb 100644 --- a/opengl/libs/Android.bp +++ b/opengl/libs/Android.bp @@ -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: [], }, diff --git a/vulkan/libvulkan/Android.bp b/vulkan/libvulkan/Android.bp index d4cb928439..440c5b144a 100644 --- a/vulkan/libvulkan/Android.bp +++ b/vulkan/libvulkan/Android.bp @@ -34,7 +34,7 @@ cc_library_shared { llndk: { symbol_file: "libvulkan.map.txt", export_llndk_headers: [ - "vulkan_headers_llndk", + "vulkan_headers", ], }, clang: true, |