commit d3c58eb7beea63ff5c703c9ffaedc1ab82672608
author Dan Albert <danalbert@google.com> Fri Jan 06 21:25:27 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 06 21:25:27 2017 +0000
tree 1e7445bb14c2525ad4de59c69686032e69e6bfa4
parent dfb2b9bda6eba216ada854241b25f281b833a83b
parent d956830ca94f66a3d501f1d798cfa6c44df2837e

Merge "Unversion NDK stub libraries." am: 3944ec426b am: ce80f3f4b0 am: e6545f3cf3
am: d956830ca9

Change-Id: Iacf84cc03329107602643009d143c2211b97398d

opengl/libs/Android.bp

diff --git a/opengl/libs/Android.bp b/opengl/libs/Android.bp
index cbdd502..60c4b36 100644
--- a/opengl/libs/Android.bp
+++ b/opengl/libs/Android.bp
@@ -26,27 +26,28 @@
     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 {

vulkan/libvulkan/Android.bp

diff --git a/vulkan/libvulkan/Android.bp b/vulkan/libvulkan/Android.bp
index f1c4c83..ba883f7 100644
--- a/vulkan/libvulkan/Android.bp
+++ b/vulkan/libvulkan/Android.bp
@@ -17,6 +17,7 @@
     name: "libvulkan.ndk",
     symbol_file: "libvulkan.map.txt",
     first_version: "24",
+    unversioned_until: "current",
 }
 
 cc_library_shared {