[PATCH Focal] UBUNTU: [Config] azure: Enable Android and ASHMEM=m, ANDROID_BINDER_IPC=m

[Tim Gardner]

BugLink: https://bugs.launchpad.net/bugs/1914568

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.azure/config/annotations          | 9 +++++++++
 debian.azure/config/config.common.ubuntu | 9 ++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
index ddbff51a2935..23917802c4fd 100644
--- a/debian.azure/config/annotations
+++ b/debian.azure/config/annotations
@@ -4,6 +4,15 @@
 
 include "../../debian.master/config/annotations"
 
+CONFIG_ANDROID                                     policy<{'amd64': 'y'}>
+CONFIG_ANDROID                                     mark<ENFORCED> note<LP:#1914568>
+
+CONFIG_ASHMEM                                      policy<{'amd64': 'm'}>
+CONFIG_ASHMEM                                      mark<ENFORCED> note<LP:#1914568>
+
+CONFIG_ANDROID_BINDER_IPC                          policy<{'amd64': 'm'}>
+CONFIG_ANDROID_BINDER_IPC                          mark<ENFORCED> note<LP:#1914568>
+
 CONFIG_MLX5_CORE                                   policy<{'amd64': 'm'}>
 CONFIG_MLX5_CORE                                   mark<ENFORCED> note<LP:#1837397>
 
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index 2eceb46ce5c0..b65f373f3bf3 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -145,7 +145,12 @@ CONFIG_AMD_NUMA=y
 # CONFIG_AMD_PHY is not set
 CONFIG_AMIGA_PARTITION=y
 # CONFIG_AMILO_RFKILL is not set
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+# CONFIG_ANDROID_BINDERFS is not set
+CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
+CONFIG_ANDROID_BINDER_IPC=m
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
+# CONFIG_ANDROID_VSOC is not set
 CONFIG_APDS9802ALS=m
 # CONFIG_APPLE_GMUX is not set
 CONFIG_APPLE_PROPERTIES=y
@@ -245,6 +250,7 @@ CONFIG_ARCNET_COM90xx=m
 CONFIG_ARCNET_COM90xxIO=m
 CONFIG_ARCNET_RAW=m
 CONFIG_ARCNET_RIM_I=m
+CONFIG_ASHMEM=m
 CONFIG_ASN1=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 # CONFIG_ASUS_LAPTOP is not set
@@ -2258,6 +2264,7 @@ CONFIG_IOMMU_API=y
 CONFIG_IOMMU_HELPER=y
 CONFIG_IOMMU_IOVA=y
 CONFIG_IOMMU_SUPPORT=y
+# CONFIG_ION is not set
 CONFIG_IONIC=m
 CONFIG_IOSCHED_BFQ=m
 CONFIG_IOSF_MBI=y
-- 
2.17.1