From ff1fe58b8a02c04cd1b8f9ceeffea45e118c8e35 Mon Sep 17 00:00:00 2001 From: Hsin-Yi Chen Date: Tue, 26 Sep 2023 17:51:09 +0800 Subject: [PATCH] Rename .map.txt used by tests The suffix ".map.txt" triggers NDK-API-Review. example.map.txt has been replaced with map.txt in the same directory. Test: ANDROID_BUILD_TOP=`realpath .` \ PATH=$PATH:`realpath out/soong/dist/bin` \ development/vndk/tools/header-checker/tests/test.py Bug: 298626434 Change-Id: Ie2e21fe87e5bfce7f081fe32eb55547d8aa611ad --- .../version_script_example/example.map.txt | 17 ----------------- .../{libexample_new.map.txt => new_map.txt} | 0 .../{libexample_old.map.txt => old_map.txt} | 0 vndk/tools/header-checker/tests/module.py | 4 ++-- 4 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 vndk/tools/header-checker/tests/integration/version_script_example/example.map.txt rename vndk/tools/header-checker/tests/integration/weak_symbols/{libexample_new.map.txt => new_map.txt} (100%) rename vndk/tools/header-checker/tests/integration/weak_symbols/{libexample_old.map.txt => old_map.txt} (100%) diff --git a/vndk/tools/header-checker/tests/integration/version_script_example/example.map.txt b/vndk/tools/header-checker/tests/integration/version_script_example/example.map.txt deleted file mode 100644 index 24dd26d20..000000000 --- a/vndk/tools/header-checker/tests/integration/version_script_example/example.map.txt +++ /dev/null @@ -1,17 +0,0 @@ -LIBVERSION_SCRIPT_EXAMPLE_1.0 { - global: - test1; # mytag - extern "C++" { - Test3::*; # mytag - }; - local: - *; -}; - -LIBVERSION_SCRIPT_EXAMPLE_PRIVATE { - global: - test2; - extern "C++" { - Test4::*; - }; -} LIBVERSION_SCRIPT_EXAMPLE_1.0; diff --git a/vndk/tools/header-checker/tests/integration/weak_symbols/libexample_new.map.txt b/vndk/tools/header-checker/tests/integration/weak_symbols/new_map.txt similarity index 100% rename from vndk/tools/header-checker/tests/integration/weak_symbols/libexample_new.map.txt rename to vndk/tools/header-checker/tests/integration/weak_symbols/new_map.txt diff --git a/vndk/tools/header-checker/tests/integration/weak_symbols/libexample_old.map.txt b/vndk/tools/header-checker/tests/integration/weak_symbols/old_map.txt similarity index 100% rename from vndk/tools/header-checker/tests/integration/weak_symbols/libexample_old.map.txt rename to vndk/tools/header-checker/tests/integration/weak_symbols/old_map.txt diff --git a/vndk/tools/header-checker/tests/module.py b/vndk/tools/header-checker/tests/module.py index 9e960ceba..16b2698e1 100755 --- a/vndk/tools/header-checker/tests/module.py +++ b/vndk/tools/header-checker/tests/module.py @@ -594,7 +594,7 @@ TEST_MODULES = [ srcs=[ 'integration/weak_symbols/example.c', ], - version_script='integration/weak_symbols/libexample_old.map.txt', + version_script='integration/weak_symbols/old_map.txt', export_include_dirs=[], dumper_flags=['-output-format', 'Json'], linker_flags=[ @@ -609,7 +609,7 @@ TEST_MODULES = [ srcs=[ 'integration/weak_symbols/example.c', ], - version_script='integration/weak_symbols/libexample_new.map.txt', + version_script='integration/weak_symbols/new_map.txt', export_include_dirs=[], dumper_flags=['-output-format', 'Json'], linker_flags=[