Snap for 14903011 from d6c3222f101cc52a654c651dabb66f5680d5b09b to 26Q2-release

Change-Id: Ifb267653e47b57a7567ca9b5193a787a35939b54

Android.bp

diff --git a/Android.bp b/Android.bp
index 2a65166..8152efa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,6 +44,11 @@
         "-Wno-unused-parameter",
         "-Wno-char-subscripts",
         "-DHAVE_STDINT_H",
+
+        // To compile with linux_musl (but OK to be in the common place).
+        "-D_GNU_SOURCE",
+        // TODO(b/485372169): Remove this when upstream has the musl support.
+        "-Wno-error=cpp",
     ],
     stl: "none",
     visibility: ["//external/libburnia:__subpackages__"],

xorriso/Android.bp

diff --git a/xorriso/Android.bp b/xorriso/Android.bp
index 7192689..9fc579d 100644
--- a/xorriso/Android.bp
+++ b/xorriso/Android.bp
@@ -52,4 +52,6 @@
         "libburn",
     ],
     stl: "none",
+    static_executable: true,
+    visibility: ["//packages/modules/Virtualization/build/debian:__subpackages__"],
 }