[SRU][G/Oracle][PATCH 1/1] UBUNTU: [config] oracle: Enable Android options for anbox

[Khalid Elmously]

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

Add necessary Android configs for Anbox

Signed-off-by: Khalid Elmously <khalid.elmously at canonical.com>
---
 debian.oracle/config/annotations          | 10 ++++++++++
 debian.oracle/config/config.common.ubuntu |  8 +++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/debian.oracle/config/annotations b/debian.oracle/config/annotations
index 2d65682261c1..ae8c6d6553b5 100644
--- a/debian.oracle/config/annotations
+++ b/debian.oracle/config/annotations
@@ -43,3 +43,13 @@ CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT         policy<{'arm64': '-'}>
 CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT         mark<ENFORCED>
 CONFIG_SERIAL_AMBA_PL011                          policy<{'amd64': '-', 'arm64': 'y'}>
 CONFIG_SERIAL_AMBA_PL011                          mark<ENFORCED> note<Needed for serial support in QEMU on arm64>
+CONFIG_ANDROID                                    policy<{'amd64': 'y', 'arm64':'y'}>
+CONFIG_ANDROID                                    mark<ENFORCED> note<needed for Anbox - LP #1928686>
+CONFIG_ANDROID_BINDERFS                           policy<{'amd64': 'm', 'arm64':'m'}>
+CONFIG_ANDROID_BINDERFS                           mark<ENFORCED> note<needed for Anbox - LP #1928686>
+CONFIG_ANDROID_BINDER_DEVICES                     policy<{'amd64': '""', 'arm64':'""'}>
+CONFIG_ANDROID_BINDER_DEVICES                     mark<ENFORCED> note<needed for Anbox - LP #1928686>
+CONFIG_ANDROID_BINDER_IPC                         policy<{'amd64': 'm', 'arm64':'m'}>
+CONFIG_ANDROID_BINDER_IPC                         mark<ENFORCED> note<needed for Anbox - LP #1928686>
+CONFIG_ASHMEM                                     policy<{'amd64': 'm', 'arm64':'m'}>
+CONFIG_ASHMEM                                     mark<ENFORCED> note<needed for Anbox - LP #1928686>
diff --git a/debian.oracle/config/config.common.ubuntu b/debian.oracle/config/config.common.ubuntu
index 037e4193882d..4b088541a727 100644
--- a/debian.oracle/config/config.common.ubuntu
+++ b/debian.oracle/config/config.common.ubuntu
@@ -273,7 +273,11 @@ CONFIG_AMD_XGBE_DCB=y
 CONFIG_AMD_XGBE_HAVE_ECC=y
 CONFIG_AMIGA_PARTITION=y
 CONFIG_AMILO_RFKILL=m
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDERFS=m
+CONFIG_ANDROID_BINDER_DEVICES=""
+CONFIG_ANDROID_BINDER_IPC=m
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 CONFIG_APDS9300=m
 CONFIG_APDS9802ALS=m
 CONFIG_APDS9960=m
@@ -538,6 +542,7 @@ CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_SP805_WATCHDOG is not set
 # CONFIG_ARM_SPE_PMU is not set
 CONFIG_AS3935=m
+CONFIG_ASHMEM=m
 CONFIG_ASM_MODVERSIONS=y
 CONFIG_ASN1=y
 CONFIG_ASSOCIATIVE_ARRAY=y
@@ -3901,6 +3906,7 @@ CONFIG_IOMMU_IOVA=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
 CONFIG_IOMMU_SUPPORT=y
+# CONFIG_ION is not set
 CONFIG_IONIC=m
 CONFIG_IOSCHED_BFQ=m
 CONFIG_IOSF_MBI=y
-- 
2.17.1