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

Merge changes I526f653e,Iefacd446

Browse Source 
am: 72bc6acd53

Change-Id: Iab6b537c44d748a3eeacc442be2f00a93c2b5463
This commit is contained in:
Logan Chien
2017-06-09 05:04:53 +00:00
committed by android-build-merger
parent 2a18d59a1c 72bc6acd53
commit f7502df5bb
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
vndk/tools/definition-tool/tests/test_elf_linker.py
View File

@@ -273,7 +273,6 @@ class ELFLinkerTest(unittest.TestCase):
'libhidltransport', 'libhidltransport',
'libhwbinder', 'libhwbinder',
'libutils', 'libutils',
'libz',
) )
# Add VNDK-SP libraries. # Add VNDK-SP libraries.

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

@@ -19,6 +19,8 @@ class NDKLibDictTest(unittest.TestCase):
self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib/libm.so')) self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib/libm.so'))
self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib/libstdc++.so')) self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib/libstdc++.so'))
self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib/libvndksupport.so')) self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib/libvndksupport.so'))
self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib/libandroid_net.so'))
self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib/libz.so'))
self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libc.so')) self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libc.so'))
self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libdl.so')) self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libdl.so'))
@@ -26,13 +28,11 @@ class NDKLibDictTest(unittest.TestCase):
self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libm.so')) self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libm.so'))
self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libstdc++.so')) self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libstdc++.so'))
self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libvndksupport.so')) self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libvndksupport.so'))
self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libandroid_net.so'))
self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libz.so'))
self.assertFalse(NDK_LIBS.is_ll_ndk('/system/lib/libm')) self.assertFalse(NDK_LIBS.is_ll_ndk('/system/lib/libm'))
# libz.so is not LL-NDK anymore.
self.assertFalse(NDK_LIBS.is_ll_ndk('/system/lib/libz.so'))
self.assertFalse(NDK_LIBS.is_ll_ndk('/system/lib64/libz.so'))
def test_is_sp_ndk(self): def test_is_sp_ndk(self):
self.assertTrue(NDK_LIBS.is_sp_ndk('/system/lib/libEGL.so')) self.assertTrue(NDK_LIBS.is_sp_ndk('/system/lib/libEGL.so'))
self.assertTrue(NDK_LIBS.is_sp_ndk('/system/lib/libGLESv1_CM.so')) self.assertTrue(NDK_LIBS.is_sp_ndk('/system/lib/libGLESv1_CM.so'))
@@ -104,12 +104,18 @@ class NDKLibDictTest(unittest.TestCase):
self.assertTrue(NDK_LIBS.is_ndk('/system/lib/liblog.so')) self.assertTrue(NDK_LIBS.is_ndk('/system/lib/liblog.so'))
self.assertTrue(NDK_LIBS.is_ndk('/system/lib/libm.so')) self.assertTrue(NDK_LIBS.is_ndk('/system/lib/libm.so'))
self.assertTrue(NDK_LIBS.is_ndk('/system/lib/libstdc++.so')) self.assertTrue(NDK_LIBS.is_ndk('/system/lib/libstdc++.so'))
self.assertTrue(NDK_LIBS.is_ndk('/system/lib/libvndksupport.so'))
self.assertTrue(NDK_LIBS.is_ndk('/system/lib/libandroid_net.so'))
self.assertTrue(NDK_LIBS.is_ndk('/system/lib/libz.so'))
self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libc.so')) self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libc.so'))
self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libdl.so')) self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libdl.so'))
self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/liblog.so')) self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/liblog.so'))
self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libm.so')) self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libm.so'))
self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libstdc++.so')) self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libstdc++.so'))
self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libvndksupport.so'))
self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libandroid_net.so'))
self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libz.so'))
# SP-NDK # SP-NDK
self.assertTrue(NDK_LIBS.is_ndk('/system/lib/libEGL.so')) self.assertTrue(NDK_LIBS.is_ndk('/system/lib/libEGL.so'))
@@ -139,10 +145,6 @@ class NDKLibDictTest(unittest.TestCase):
self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libmediandk.so')) self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libmediandk.so'))
self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libvulkan.so')) self.assertTrue(NDK_LIBS.is_ndk('/system/lib64/libvulkan.so'))
# libz.so is not NDK anymore.
self.assertFalse(NDK_LIBS.is_ndk('/system/lib/libz.so'))
self.assertFalse(NDK_LIBS.is_ndk('/system/lib64/libz.so'))
def test_classify(self): def test_classify(self):
self.assertEqual(NDK_LIBS.NOT_NDK, self.assertEqual(NDK_LIBS.NOT_NDK,
NDK_LIBS.classify('/system/lib/libfoo.so')) NDK_LIBS.classify('/system/lib/libfoo.so'))

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

@@ -542,6 +542,8 @@ class NDKLibDict(object):
'libm.so', 'libm.so',
'libstdc++.so', 'libstdc++.so',
'libvndksupport.so', 'libvndksupport.so',
'libandroid_net.so',
'libz.so',
) )
SP_NDK_LIB_NAMES = ( SP_NDK_LIB_NAMES = (
@@ -1124,7 +1126,6 @@ class ELFLinker(object):
'^.*/libhidltransport\\.so$', '^.*/libhidltransport\\.so$',
'^.*/libhwbinder\\.so$', '^.*/libhwbinder\\.so$',
'^.*/libutils\\.so$', '^.*/libutils\\.so$',
'^.*/libz\\.so$',
# Only for o-release # Only for o-release
'^.*/android\\.hidl\\.base@1\\.0\\.so$', '^.*/android\\.hidl\\.base@1\\.0\\.so$',