From 16538ed728db69509c457adb0b25703c65f9ca86 Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Fri, 9 Jun 2017 02:18:21 +0800 Subject: [PATCH 1/2] vndk-def: Add libandroid_net to LL-NDK Test: ./tests/test_ndk_libs.py Test: libandroid_net.so is tagged as LL-NDK. Change-Id: Iefacd4464e7d94577119532c11435e70404ea026 --- vndk/tools/definition-tool/tests/test_ndk_libs.py | 6 ++++++ vndk/tools/definition-tool/vndk_definition_tool.py | 1 + 2 files changed, 7 insertions(+) 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 = ( From 1715340334ba965b047c9f104bd3ff268899992f Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Fri, 9 Jun 2017 10:01:20 +0800 Subject: [PATCH 2/2] vndk-def: Add libz.so back to LL-NDK This commit adds libz.so back to LL-NDK because the change to move libz.so to VNDK-SP breaks some CTS testcases (which assume there is only one libz.so under /system/lib[64].) Whether this is a short-term temporary fix or a long-term solution will be discussed or updated in b/37617391. Bug: 62195853 Bug: 37867089 Bug: 37617391 Test: ./tests/test_ndk_libs.py Test: ./tests/run.py Test: libz.so tagged as LL-NDK with sailfish images. Change-Id: I526f653e6141d658ee19e79eefd44d379ecac0dc --- vndk/tools/definition-tool/tests/test_elf_linker.py | 1 - vndk/tools/definition-tool/tests/test_ndk_libs.py | 12 ++++-------- vndk/tools/definition-tool/vndk_definition_tool.py | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/vndk/tools/definition-tool/tests/test_elf_linker.py b/vndk/tools/definition-tool/tests/test_elf_linker.py index 68109f26f..d3eecdd1e 100755 --- a/vndk/tools/definition-tool/tests/test_elf_linker.py +++ b/vndk/tools/definition-tool/tests/test_elf_linker.py @@ -273,7 +273,6 @@ class ELFLinkerTest(unittest.TestCase): 'libhidltransport', 'libhwbinder', 'libutils', - 'libz', ) # Add VNDK-SP libraries. diff --git a/vndk/tools/definition-tool/tests/test_ndk_libs.py b/vndk/tools/definition-tool/tests/test_ndk_libs.py index 2d05c1e46..00a4c180c 100755 --- a/vndk/tools/definition-tool/tests/test_ndk_libs.py +++ b/vndk/tools/definition-tool/tests/test_ndk_libs.py @@ -20,6 +20,7 @@ class NDKLibDictTest(unittest.TestCase): 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/lib/libz.so')) self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libc.so')) self.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libdl.so')) @@ -28,13 +29,10 @@ class NDKLibDictTest(unittest.TestCase): 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.assertTrue(NDK_LIBS.is_ll_ndk('/system/lib64/libz.so')) 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): self.assertTrue(NDK_LIBS.is_sp_ndk('/system/lib/libEGL.so')) self.assertTrue(NDK_LIBS.is_sp_ndk('/system/lib/libGLESv1_CM.so')) @@ -108,6 +106,7 @@ class NDKLibDictTest(unittest.TestCase): 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/libdl.so')) @@ -116,6 +115,7 @@ class NDKLibDictTest(unittest.TestCase): 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 self.assertTrue(NDK_LIBS.is_ndk('/system/lib/libEGL.so')) @@ -145,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/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): self.assertEqual(NDK_LIBS.NOT_NDK, NDK_LIBS.classify('/system/lib/libfoo.so')) diff --git a/vndk/tools/definition-tool/vndk_definition_tool.py b/vndk/tools/definition-tool/vndk_definition_tool.py index 32d549079..6f83b9be9 100755 --- a/vndk/tools/definition-tool/vndk_definition_tool.py +++ b/vndk/tools/definition-tool/vndk_definition_tool.py @@ -543,6 +543,7 @@ class NDKLibDict(object): 'libstdc++.so', 'libvndksupport.so', 'libandroid_net.so', + 'libz.so', ) SP_NDK_LIB_NAMES = ( @@ -1125,7 +1126,6 @@ class ELFLinker(object): '^.*/libhidltransport\\.so$', '^.*/libhwbinder\\.so$', '^.*/libutils\\.so$', - '^.*/libz\\.so$', # Only for o-release '^.*/android\\.hidl\\.base@1\\.0\\.so$',