aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Desaulniers <ndesaulniers@google.com>2022-01-14 18:56:06 +0000
committerNick Desaulniers <ndesaulniers@google.com>2022-01-14 18:57:39 +0000
commit1ede69c685f0217fd14e69238117172a183a283b (patch)
treee653d9ead9b79b9aa2f1523ab8141a23f1a1ba98
parentdd46951e69ed0df57855080431cc478f859e9e79 (diff)
downloadconfigs-1ede69c685f0217fd14e69238117172a183a283b.tar.gz
Revert "Revert "Require clang be used to assemble the kernel""
This reverts commit dd46951e69ed0df57855080431cc478f859e9e79. Reason for revert: downstream kernel projects failed an unrelated SELinux related test when they updated from Android Common Kernel, so they rolled back their pull dropping the patches necessary to make this test pass. Bug: 210043760 Bug: 214384465 Change-Id: I0f591dfa23017fec00733891dad6ec286a697585
-rw-r--r--android-5.10/android-base.config1
-rw-r--r--android-5.15/android-base.config1
2 files changed, 2 insertions, 0 deletions
diff --git a/android-5.10/android-base.config b/android-5.10/android-base.config
index 3e4bf29..42eb70f 100644
--- a/android-5.10/android-base.config
+++ b/android-5.10/android-base.config
@@ -20,6 +20,7 @@ CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
CONFIG_ANDROID_BINDER_IPC=y
CONFIG_ANDROID_BINDERFS=y
CONFIG_ASHMEM=y
+CONFIG_AS_IS_LLVM=y
CONFIG_AUDIT=y
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_SCRIPT=y
diff --git a/android-5.15/android-base.config b/android-5.15/android-base.config
index 3e4bf29..42eb70f 100644
--- a/android-5.15/android-base.config
+++ b/android-5.15/android-base.config
@@ -20,6 +20,7 @@ CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
CONFIG_ANDROID_BINDER_IPC=y
CONFIG_ANDROID_BINDERFS=y
CONFIG_ASHMEM=y
+CONFIG_AS_IS_LLVM=y
CONFIG_AUDIT=y
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_SCRIPT=y