diff options
| author | Logan Chien <loganchien@google.com> | 2017-06-09 02:18:21 +0800 |
|---|---|---|
| committer | Logan Chien <loganchien@google.com> | 2017-06-10 01:01:11 +0800 |
| commit | b9a941830d8517c9533059a0498084e138ec07c2 (patch) | |
| tree | 1c44b2d983394a1d417704d2134de744f098b07d | |
| parent | 79bff6a973cc8ed9b44c69a2044afbb7f67086ae (diff) | |
| download | android_development-b9a941830d8517c9533059a0498084e138ec07c2.tar.gz android_development-b9a941830d8517c9533059a0498084e138ec07c2.tar.bz2 android_development-b9a941830d8517c9533059a0498084e138ec07c2.zip | |
vndk-def: Add libandroid_net to LL-NDK
Test: ./tests/test_ndk_libs.py
Test: libandroid_net.so is tagged as LL-NDK.
Merged-In: Iefacd4464e7d94577119532c11435e70404ea026
(cherry picked from commit 16538ed728db69509c457adb0b25703c65f9ca86)
Change-Id: I91c318f1ab1b782f6bc2786cbc9d18276416def6
| -rwxr-xr-x | vndk/tools/definition-tool/tests/test_ndk_libs.py | 6 | ||||
| -rwxr-xr-x | vndk/tools/definition-tool/vndk_definition_tool.py | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/vndk/tools/definition-tool/tests/test_ndk_libs.py b/vndk/tools/definition-tool/tests/test_ndk_libs.py index 976badccb..2d05c1e46 100755 --- a/vndk/tools/definition-tool/tests/test_ndk_libs.py +++ b/vndk/tools/definition-tool/tests/test_ndk_libs.py @@ -19,6 +19,7 @@ class NDKLibDictTest(unittest.TestCase): 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/libvndksupport.so')) + self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib/libandroid_net.so')) self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libc.so')) self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libdl.so')) @@ -26,6 +27,7 @@ class NDKLibDictTest(unittest.TestCase): 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/libvndksupport.so')) + self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libandroid_net.so')) self.assertFalse(NDK_LIBS.is_ll_ndk('/system/lib/libm')) @@ -104,12 +106,16 @@ class NDKLibDictTest(unittest.TestCase): 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/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/lib64/libc.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/libm.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')) # SP-NDK self.assertTrue(NDK_LIBS.is_ndk('/system/lib/libEGL.so')) diff --git a/vndk/tools/definition-tool/vndk_definition_tool.py b/vndk/tools/definition-tool/vndk_definition_tool.py index 7ab84ae2e..32d549079 100755 --- a/vndk/tools/definition-tool/vndk_definition_tool.py +++ b/vndk/tools/definition-tool/vndk_definition_tool.py @@ -542,6 +542,7 @@ class NDKLibDict(object): 'libm.so', 'libstdc++.so', 'libvndksupport.so', + 'libandroid_net.so', ) SP_NDK_LIB_NAMES = ( |