From 74a622a17f1f8fc6467a33c2a6ac86bb119e7171 Mon Sep 17 00:00:00 2001
From: Jiakai Zhang <jiakaiz@google.com>
Date: Wed, 20 Sep 2023 13:06:09 +0100
Subject: Statically link generate-boot-image against non-ABI-stable libraries.

In chroot test, generate-boot-image is pushed to
<chroot-dir>/data/local/tmp, so it cannot link against the shared libs
in the <chroot-dir>/apex/com.android.art during dynamic linking.

Bug: 247108425
Test: -
  1. art/tools/buildbot-build.sh --target
  2. readelf -d $ANDROID_PRODUCT_OUT/system/bin/generate-boot-image64 | grep NEEDED
  3. Only see ABI-stable libraries.
Change-Id: I8794e8c9b42cd3fdb6d26b1785dad9d0ac6a4f4a
---
 test/generate-boot-image/Android.bp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'test/generate-boot-image')

diff --git a/test/generate-boot-image/Android.bp b/test/generate-boot-image/Android.bp
index 00ce3d328a..60aac13e91 100644
--- a/test/generate-boot-image/Android.bp
+++ b/test/generate-boot-image/Android.bp
@@ -43,13 +43,14 @@ art_cc_binary {
     ],
     srcs: ["generate-boot-image.cc"],
     shared_libs: [
-        "libbase",
         "liblog",
     ],
     static_libs: [
         "libartbase",
         "libartbase-testing",
+        "libbase",
     ],
+    stl: "c++_static",
     tidy: true,
     tidy_flags: [
         "-format-style=file",
-- 
cgit v1.2.3-59-g8ed1b