diff options
| author | Colin Cross <ccross@android.com> | 2021-04-26 17:19:59 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2021-04-26 17:43:42 -0700 |
| commit | ed0e6e63ad09850402e278e03bb44e61c16a783e (patch) | |
| tree | 97181072e213cb8c7d329a556eade3131839d107 /opengl | |
| parent | b9627468805c0af3f2492f597a61ae6f2f339d27 (diff) | |
Remove llndk_headers module
Use a cc_library_headers module with llndk.llndk_headers: true instead
of an llndk_headers module.
Bug: 170784825
Test: m checkbuild
Test: compare out/soong/build.ninja
Change-Id: I6717ab613adde20652f6e861ca7179e202e63a83
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/Android.bp | 8 | ||||
| -rw-r--r-- | opengl/libs/Android.bp | 8 |
2 files changed, 7 insertions, 9 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: [], }, |