diff options
| author | 2017-01-06 21:25:27 +0000 | |
|---|---|---|
| committer | 2017-01-06 21:25:27 +0000 | |
| commit | d3c58eb7beea63ff5c703c9ffaedc1ab82672608 (patch) | |
| tree | 1e7445bb14c2525ad4de59c69686032e69e6bfa4 | |
| parent | dfb2b9bda6eba216ada854241b25f281b833a83b (diff) | |
| parent | d956830ca94f66a3d501f1d798cfa6c44df2837e (diff) | |
Merge "Unversion NDK stub libraries." am: 3944ec426b am: ce80f3f4b0 am: e6545f3cf3
am: d956830ca9
Change-Id: Iacf84cc03329107602643009d143c2211b97398d
| -rw-r--r-- | opengl/libs/Android.bp | 7 | ||||
| -rw-r--r-- | vulkan/libvulkan/Android.bp | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/opengl/libs/Android.bp b/opengl/libs/Android.bp index cbdd502b32..60c4b365d1 100644 --- a/opengl/libs/Android.bp +++ b/opengl/libs/Android.bp @@ -26,27 +26,28 @@ ndk_library { name: "libEGL.ndk", symbol_file: "libEGL.map.txt", first_version: "9", + unversioned_until: "current", } ndk_library { name: "libGLESv1_CM.ndk", symbol_file: "libGLESv1_CM.map.txt", first_version: "9", + unversioned_until: "current", } ndk_library { name: "libGLESv2.ndk", symbol_file: "libGLESv2.map.txt", first_version: "9", + unversioned_until: "current", } ndk_library { name: "libGLESv3.ndk", symbol_file: "libGLESv3.map.txt", first_version: "18", - - // https://github.com/android-ndk/ndk/issues/265 - unversioned_until: "24", + unversioned_until: "current", } cc_defaults { diff --git a/vulkan/libvulkan/Android.bp b/vulkan/libvulkan/Android.bp index f1c4c83a61..ba883f73f1 100644 --- a/vulkan/libvulkan/Android.bp +++ b/vulkan/libvulkan/Android.bp @@ -17,6 +17,7 @@ ndk_library { name: "libvulkan.ndk", symbol_file: "libvulkan.map.txt", first_version: "24", + unversioned_until: "current", } cc_library_shared { |