diff options
| author | Colin Cross <ccross@android.com> | 2020-10-19 13:38:00 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2020-10-19 13:38:00 -0700 |
| commit | 8af6d1cda78fe21a2f733fd3caff9e5b0b60585b (patch) | |
| tree | 829184fd2d4ca32ac46b8962e4927edcc03b59a2 /opengl | |
| parent | f1cfae86f21f38705aa57b204e38fb7715ae8388 (diff) | |
Make the connection between implementation and llndk_library explicit
Instead of assuming a module with the .llndk suffix exists, add an
llndk_stubs property to every cc_library module that has a
corresponding llndk_library. Also rename the llndk_library to have
an explicit .llndk suffix.
Bug: 170784825
Test: no changes to build.ninja (excluding comments) or Android-${TARGET_PRODUCT}.mk
Change-Id: Ic4fa093f126490394909867a08448ed886bc5955
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/Android.bp | 8 | ||||
| -rw-r--r-- | opengl/libs/Android.bp | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/opengl/Android.bp b/opengl/Android.bp index 9ca8b0b0fd..393ced7196 100644 --- a/opengl/Android.bp +++ b/opengl/Android.bp @@ -53,25 +53,25 @@ ndk_headers { } llndk_library { - name: "libEGL", + name: "libEGL.llndk", symbol_file: "libs/libEGL.map.txt", export_include_dirs: ["include"], } llndk_library { - name: "libGLESv1_CM", + name: "libGLESv1_CM.llndk", symbol_file: "libs/libGLESv1_CM.map.txt", export_include_dirs: ["include"], } llndk_library { - name: "libGLESv2", + name: "libGLESv2.llndk", symbol_file: "libs/libGLESv2.map.txt", export_include_dirs: ["include"], } llndk_library { - name: "libGLESv3", + name: "libGLESv3.llndk", symbol_file: "libs/libGLESv3.map.txt", export_include_dirs: ["include"], } diff --git a/opengl/libs/Android.bp b/opengl/libs/Android.bp index e8d3684e4e..e7c2e949f5 100644 --- a/opengl/libs/Android.bp +++ b/opengl/libs/Android.bp @@ -133,6 +133,7 @@ cc_library_static { cc_library_shared { name: "libEGL", defaults: ["egl_libs_defaults"], + llndk_stubs: "libEGL.llndk", srcs: [ "EGL/egl_tls.cpp", "EGL/egl_cache.cpp", @@ -198,6 +199,7 @@ cc_defaults { cc_library_shared { name: "libGLESv1_CM", defaults: ["gles_libs_defaults"], + llndk_stubs: "libGLESv1_CM.llndk", srcs: ["GLES_CM/gl.cpp"], cflags: ["-DLOG_TAG=\"libGLESv1\""], version_script: "libGLESv1_CM.map.txt", @@ -209,6 +211,7 @@ cc_library_shared { cc_library_shared { name: "libGLESv2", defaults: ["gles_libs_defaults"], + llndk_stubs: "libGLESv2.llndk", srcs: ["GLES2/gl2.cpp"], cflags: ["-DLOG_TAG=\"libGLESv2\""], @@ -223,6 +226,7 @@ cc_library_shared { cc_library_shared { name: "libGLESv3", defaults: ["gles_libs_defaults"], + llndk_stubs: "libGLESv3.llndk", srcs: ["GLES2/gl2.cpp"], cflags: ["-DLOG_TAG=\"libGLESv3\""], } |