From 0fc8410b073951bc212bbb237efe20e515fc8f7c Mon Sep 17 00:00:00 2001
From: Inseob Kim <inseob@google.com>
Date: Tue, 11 Feb 2025 10:08:50 +0900
Subject: [PATCH] Fix uprobestats deps for 32-bit targets

We must use `deps`, not `multilib.lib64`, because uprobestats is a
native binary and we also consider 32-bit targets.

Bug: 381019944
Test: build all aosp_{target} targets
Change-Id: I001ac687ffc3874719ad9f685690b36729192aa0
---
 target/product/generic/Android.bp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/target/product/generic/Android.bp b/target/product/generic/Android.bp
index 288ac2a2a7..3057137b8e 100644
--- a/target/product/generic/Android.bp
+++ b/target/product/generic/Android.bp
@@ -742,6 +742,11 @@ system_image_defaults {
             "update_engine_client",
         ],
         default: [],
+    }) + select(release_flag("RELEASE_UPROBESTATS_MODULE"), {
+        true: [],
+        default: [
+            "uprobestats", // base_system internal
+        ],
     }),
     multilib: {
         common: {
@@ -894,12 +899,7 @@ system_image_defaults {
                 "android.system.virtualizationservice-ndk",
                 "libgsi",
                 "servicemanager",
-            ] + select(release_flag("RELEASE_UPROBESTATS_MODULE"), {
-                true: [],
-                default: [
-                    "uprobestats", // base_system internal
-                ],
-            }),
+            ],
         },
         both: {
             deps: [