From 315d047b46f47b5ef8cdeaee2e3c951699ac434b Mon Sep 17 00:00:00 2001
From: Hsin-Yi Chen <hsinyichen@google.com>
Date: Wed, 16 Nov 2022 23:25:16 +0800
Subject: [PATCH] Fix the unit test for header-abi-dumper -print-resource-dir

The resource dir has been changed from lib64 to lib since clang-r468909.
build-prebuilts.sh creates lib in the dist dir so that developers can
easily run the binaries.

Test: development/vndk/tools/header-checker/android/build-prebuilts.sh
Test: development/vndk/tools/header-checker/tests/test.py
Bug: 255702405
Change-Id: I9bed6f0fd7948830a89d9e24889d9341ebf1a9c4
---
 vndk/tools/header-checker/android/build-prebuilts.sh    | 3 +++
 vndk/tools/header-checker/android/update_clang-tools.sh | 4 ----
 vndk/tools/header-checker/tests/test.py                 | 5 +++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/vndk/tools/header-checker/android/build-prebuilts.sh b/vndk/tools/header-checker/android/build-prebuilts.sh
index 5bbed2c7a..5609c3df7 100755
--- a/vndk/tools/header-checker/android/build-prebuilts.sh
+++ b/vndk/tools/header-checker/android/build-prebuilts.sh
@@ -149,6 +149,9 @@ mkdir -p "${CLANG_LIB_DIR_OUT}"
 cp -R "${CLANG_LIB_DIR}/share" "${CLANG_LIB_DIR_OUT}/share"
 cp -R "${CLANG_LIB_DIR}/include" "${CLANG_LIB_DIR_OUT}/include"
 ln -s "lib64/clang/${LLVM_RELEASE_VERSION}/include" "${SOONG_DIST}/clang-headers"
+# create symlink lib -> lib64 as toolchain libraries have a RUNPATH pointing to
+# $ORIGIN/../lib instead of lib64
+ln -s "lib64" "${SOONG_DIST}/lib"
 
 # Normalize library file names.  All library file names must match their soname.
 function extract_soname () {
diff --git a/vndk/tools/header-checker/android/update_clang-tools.sh b/vndk/tools/header-checker/android/update_clang-tools.sh
index ed6958502..577e19391 100755
--- a/vndk/tools/header-checker/android/update_clang-tools.sh
+++ b/vndk/tools/header-checker/android/update_clang-tools.sh
@@ -60,10 +60,6 @@ update_prebuilts () {
   rm .fetch* || true
 
   find . | xargs touch
-
-  # create symlink lib -> lib64 as toolchain libraries have a RUNPATH pointing
-  # to $ORIGIN/../lib instead of lib64
-  ln -s lib64 lib
 }
 
 
diff --git a/vndk/tools/header-checker/tests/test.py b/vndk/tools/header-checker/tests/test.py
index fd9a93153..2faa073f9 100755
--- a/vndk/tools/header-checker/tests/test.py
+++ b/vndk/tools/header-checker/tests/test.py
@@ -405,8 +405,9 @@ class HeaderCheckerTest(unittest.TestCase):
         resource_dir = subprocess.check_output(
             ["header-abi-dumper", "-print-resource-dir"], text=True,
             stderr=subprocess.DEVNULL).strip()
-        self.assertEqual(os.path.dirname(resource_dir),
-                         os.path.join(common_dir, "lib64", "clang"))
+        self.assertIn(os.path.dirname(resource_dir),
+                      (os.path.join(common_dir, "lib64", "clang"),
+                       os.path.join(common_dir, "lib", "clang")))
         self.assertRegex(os.path.basename(resource_dir), r"^[\d.]+$")
 
     def test_struct_extensions(self):