commit c4450c3872a01780d6ee5b02d56ab4883b0a53c1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jun 18 21:59:53 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 18 21:59:53 2024 +0000
tree 6dfa3ed574d3c985e0f6f448a3b542d87ad13560
parent 55f0929b4f2f9641b74340006700d205d9b938f7
parent 1c2ba6a5c5971dfad9750db095e62f31a6dcc9aa

Merge "Factor out the bug 24465209 workaround for libdl too." into main

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 40215a7..018b7c0 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -120,12 +120,12 @@
 // ========================================================
 cc_defaults {
     name: "bug_24465209_workaround",
-    arch: {
-        arm: {
+    target: {
+        android_arm: {
             pack_relocations: false,
             ldflags: ["-Wl,--hash-style=both"],
         },
-        x86: {
+        android_x86: {
             pack_relocations: false,
             ldflags: ["-Wl,--hash-style=both"],
         }