Merge Android 14

Bug: 298295554
Merged-In: Ibd0be525fbd881c4b84ff6b14923c9d372334dda
Change-Id: Ia79115325af7298d088b10a608c2424ba058e514

1 files changed, 10 insertions, 8 deletions

diff --git a/Android.bp b/Android.bp
index 8fc5ed6..a60b12f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,14 +52,16 @@ cc_library {
         bionic: {
             system_shared_libs: ["libc", "libdl"],
         },
-    },
-
-    sanitize: {
-        integer_overflow: true,
-        misc_undefined: ["bounds"],
-        diag: {
-            integer_overflow: true,
-            misc_undefined: ["bounds"],
+        android: {
+            // TODO(b/263841853): check linking error for host
+            sanitize: {
+                integer_overflow: true,
+                misc_undefined: ["bounds"],
+                diag: {
+                    integer_overflow: true,
+                    misc_undefined: ["bounds"],
+                },
+            },
         },
     },
 }