commit ce80f3f4b00455ed3d1c34a34afe323472e481ca
author Dan Albert <danalbert@google.com> Fri Jan 06 21:03:17 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 06 21:03:17 2017 +0000
tree 64c95e60f74e53f89e31e1660afc26c16f64e3c4
parent 20b8c55a5e3ad33946462e810c16f2fd32a9a60b
parent 3944ec426b766807cd230ca66d485dc6a0f60f89

Merge "Unversion NDK stub libraries."
am: 3944ec426b

Change-Id: I3266580d6f41b32ec8775e0bb73c66303ed5fa62

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 34697d1..147cc56 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 {