DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: I34602dba228f5f8cf67d39a5e295a80c5db76875
diff --git a/Android.bp b/Android.bp
index 10471bc..503d42d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,6 +53,8 @@
"-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 @@
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
