From 5fa0613c5fb3252c852122bcb86cb167385f444a Mon Sep 17 00:00:00 2001
From: Logan Chien <loganchien@google.com>
Date: Tue, 28 Mar 2017 10:21:33 +0800
Subject: [PATCH] vndk-def: Add libvulkan.so to SP-NDK.

As discussed in F2F meeting, add libvulkan.so to SP-NDK to allow vendor
usages.

Test: ./tests/run.py
Change-Id: Ifebf01f24339a75309df24411eb7ee6a37661f9e
---
 vndk/tools/definition-tool/tests/test_ndk_libs.py | 15 +++++++++++++--
 .../tools/definition-tool/vndk_definition_tool.py |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/vndk/tools/definition-tool/tests/test_ndk_libs.py b/vndk/tools/definition-tool/tests/test_ndk_libs.py
index 7eada1654..38a27cf40 100755
--- a/vndk/tools/definition-tool/tests/test_ndk_libs.py
+++ b/vndk/tools/definition-tool/tests/test_ndk_libs.py
@@ -35,11 +35,13 @@ class NDKLibDictTest(unittest.TestCase):
         self.assertTrue(NDK_LIBS.is_spndk('/system/lib/libGLESv1_CM.so'))
         self.assertTrue(NDK_LIBS.is_spndk('/system/lib/libGLESv2.so'))
         self.assertTrue(NDK_LIBS.is_spndk('/system/lib/libGLESv3.so'))
+        self.assertTrue(NDK_LIBS.is_spndk('/system/lib/libvulkan.so'))
 
         self.assertTrue(NDK_LIBS.is_spndk('/system/lib64/libEGL.so'))
         self.assertTrue(NDK_LIBS.is_spndk('/system/lib64/libGLESv1_CM.so'))
         self.assertTrue(NDK_LIBS.is_spndk('/system/lib64/libGLESv2.so'))
         self.assertTrue(NDK_LIBS.is_spndk('/system/lib64/libGLESv3.so'))
+        self.assertTrue(NDK_LIBS.is_spndk('/system/lib64/libvulkan.so'))
 
         # Vendor libraries with the same name are still not SP-NDK.
         self.assertFalse(NDK_LIBS.is_spndk('/vendor/lib64/libEGL.so'))
@@ -52,6 +54,9 @@ class NDKLibDictTest(unittest.TestCase):
         self.assertFalse(NDK_LIBS.is_spndk('/vendor/lib64/egl/libGLESv2.so'))
         self.assertFalse(NDK_LIBS.is_spndk('/vendor/lib64/egl/libGLESv3.so'))
 
+        self.assertFalse(NDK_LIBS.is_spndk('/vendor/lib64/libvulkan.so'))
+        self.assertFalse(NDK_LIBS.is_spndk('/vendor/lib64/vulkan.so'))
+
         # LL-NDK is not SP-NDK.
         self.assertFalse(NDK_LIBS.is_spndk('/system/lib/libc.so'))
 
@@ -62,7 +67,6 @@ class NDKLibDictTest(unittest.TestCase):
         self.assertTrue(NDK_LIBS.is_hlndk('/system/lib/libcamera2ndk.so'))
         self.assertTrue(NDK_LIBS.is_hlndk('/system/lib/libjnigraphics.so'))
         self.assertTrue(NDK_LIBS.is_hlndk('/system/lib/libmediandk.so'))
-        self.assertTrue(NDK_LIBS.is_hlndk('/system/lib/libvulkan.so'))
 
         self.assertTrue(NDK_LIBS.is_hlndk('/system/lib64/libOpenMAXAL.so'))
         self.assertTrue(NDK_LIBS.is_hlndk('/system/lib64/libOpenSLES.so'))
@@ -70,7 +74,6 @@ class NDKLibDictTest(unittest.TestCase):
         self.assertTrue(NDK_LIBS.is_hlndk('/system/lib64/libcamera2ndk.so'))
         self.assertTrue(NDK_LIBS.is_hlndk('/system/lib64/libjnigraphics.so'))
         self.assertTrue(NDK_LIBS.is_hlndk('/system/lib64/libmediandk.so'))
-        self.assertTrue(NDK_LIBS.is_hlndk('/system/lib64/libvulkan.so'))
 
         # LL-NDK and SP-NDK are not HL-NDK.
         self.assertFalse(NDK_LIBS.is_hlndk('/system/lib/libc.so'))
@@ -78,6 +81,14 @@ class NDKLibDictTest(unittest.TestCase):
         self.assertFalse(NDK_LIBS.is_hlndk('/system/lib/libGLESv1_CM.so'))
         self.assertFalse(NDK_LIBS.is_hlndk('/system/lib/libGLESv2.so'))
         self.assertFalse(NDK_LIBS.is_hlndk('/system/lib/libGLESv3.so'))
+        self.assertFalse(NDK_LIBS.is_hlndk('/system/lib/libvulkan.so'))
+
+        self.assertFalse(NDK_LIBS.is_hlndk('/system/lib64/libc.so'))
+        self.assertFalse(NDK_LIBS.is_hlndk('/system/lib64/libEGL.so'))
+        self.assertFalse(NDK_LIBS.is_hlndk('/system/lib64/libGLESv1_CM.so'))
+        self.assertFalse(NDK_LIBS.is_hlndk('/system/lib64/libGLESv2.so'))
+        self.assertFalse(NDK_LIBS.is_hlndk('/system/lib64/libGLESv3.so'))
+        self.assertFalse(NDK_LIBS.is_hlndk('/system/lib64/libvulkan.so'))
 
     def test_is_ndk(self):
         # LL-NDK
diff --git a/vndk/tools/definition-tool/vndk_definition_tool.py b/vndk/tools/definition-tool/vndk_definition_tool.py
index 326bded3c..19e926820 100755
--- a/vndk/tools/definition-tool/vndk_definition_tool.py
+++ b/vndk/tools/definition-tool/vndk_definition_tool.py
@@ -491,6 +491,7 @@ class NDKLibDict(object):
         'libGLESv1_CM.so',
         'libGLESv2.so',
         'libGLESv3.so',
+        'libvulkan.so',
     )
 
     HLNDK_LIB_NAMES = (
@@ -500,7 +501,6 @@ class NDKLibDict(object):
         'libcamera2ndk.so',
         'libjnigraphics.so',
         'libmediandk.so',
-        'libvulkan.so',
     )
 
     @staticmethod