Snap for 5286292 from 7de9d4db215681300ce1734163aceb4b8dbb25e2 to qt-release

Change-Id: Ia4d3c77a221b2ee5e73896bda4d4b4ab93408f8d

2 files changed, 5 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 10471bc..503d42d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,6 +53,8 @@ cc_library_static {
         "-Wno-unused-parameter",
         "-Wno-missing-field-initializers",
         "-DXLOCALEDIR=\"/usr/share/X11/locale\"",
+        // Needed because libxkbcommon uses GNU extension asprintf().
+        "-D_GNU_SOURCE",
         "-DDEFAULT_XKB_LAYOUT=\"us\"",
         "-DDEFAULT_XKB_MODEL=\"pc105\"",
         "-DDEFAULT_XKB_RULES=\"evdev\"",
@@ -61,5 +63,6 @@ cc_library_static {
     local_include_dirs: ["xkbcommon/src"],
     export_include_dirs: ["xkbcommon"],
     vendor_available: true,
+    host_supported: true,
     name: "libxkbcommon",
 }
diff --git a/OWNERS b/OWNERS
index 1f90d0e..6ccd5b6 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,5 @@
 # Default code reviewers picked from top 3 or more developers.
 # Please update this list if you find better candidates.
+prabirmsp@google.com
 xutan@google.com
+yhanada@google.com