commit c6034e4228b054abe1f279feda58fa6bae1b4941
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Nov 15 00:26:40 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 15 00:26:40 2023 +0000
tree a7f40f7a415e8edc5dc37c62e5b2e51e4f0a159b
parent fb85d77da6a93e9d81f7d5a51289385fd0f134a8
parent 4b94522c140f5d9e3740af029858d886ead3e539

Merge "Move ; in NDK declaration" into main

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 174ecd9..ced306e 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1736,7 +1736,12 @@
         arm: {
             // TODO: This is to work around b/24465209. Remove after root cause is fixed.
             pack_relocations: false,
-            ldflags: ["-Wl,--hash-style=both"],
+            ldflags: [
+                "-Wl,--hash-style=both",
+                // Since we are preserving the debug_frame, do not compress
+                // in this case to make unwinds as fast as possible.
+                "-Wl,--compress-debug-sections=none",
+            ],
 
             version_script: ":libc.arm.map",
             no_libcrt: true,

libc/include/string.h

diff --git a/libc/include/string.h b/libc/include/string.h
index 89b2a45..47bdd72 100644
--- a/libc/include/string.h
+++ b/libc/include/string.h
@@ -37,7 +37,7 @@
 
 __BEGIN_DECLS
 
-#if defined(__USE_BSD)
+#if defined(__USE_BSD) || defined(__USE_GNU)
 #include <strings.h>
 #endif