[SRU][H/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 |  7 ++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian.oracle/config/annotations b/debian.oracle/config/annotations
index e549c3cd5fc2..0d95a6d770f6 100644
--- a/debian.oracle/config/annotations
+++ b/debian.oracle/config/annotations
@@ -39,3 +39,13 @@ CONFIG_SND_SOC_INTEL_CNL                          mark<ENFORCED> note<not select
 CONFIG_SYSTEM_TRUSTED_KEYS                        policy<{'amd64': '"debian/canonical-certs.pem"'}>
 CONFIG_X86_UV                                     policy<{'amd64': 'n'}>
 CONFIG_X86_UV                                     mark<ENFORCED> note<not needed for cloud kernels>
+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 d315c551bbc3..48c304396481 100644
--- a/debian.oracle/config/config.common.ubuntu
+++ b/debian.oracle/config/config.common.ubuntu
@@ -262,7 +262,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
@@ -373,6 +377,7 @@ CONFIG_ARCNET_RAW=m
 CONFIG_ARCNET_RIM_I=m
 CONFIG_AS3935=m
 # CONFIG_AS73211 is not set
+CONFIG_ASHMEM=m
 CONFIG_ASM_MODVERSIONS=y
 CONFIG_ASN1=y
 CONFIG_ASSOCIATIVE_ARRAY=y
-- 
2.17.1