LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "vndk-def: Add libvulkan.so to SP-NDK." am: d81a6e7cfc

Browse Source 
am: c93b03bdb3

Change-Id: I182723e5fc4ef22ff882f67d8ff110401ef64731
This commit is contained in:
Logan Chien
2017-03-28 13:45:41 +00:00
committed by android-build-merger
parent 1c851767b4 c93b03bdb3
commit dc8bbf7102
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
vndk/tools/definition-tool/tests/test_ndk_libs.py
View File

@@ -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

2
vndk/tools/definition-tool/vndk_definition_tool.py
View File

@@ -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