From 9e2b44ffb2b5077b5243ba3fc677331174faaa03 Mon Sep 17 00:00:00 2001
From: Elliot Berman <quic_eberman@quicinc.com>
Date: Mon, 18 Oct 2021 09:34:34 -0700
Subject: [PATCH] build.config: Enable hermetic toolchain on msm-kernel

Enable "mostly" hermetic toolchain on msm-kernel for targets which need
openssl.  For those targets, use DISABLE_HERMETIC_SYSROOT to work around
missing aosp/1843323. This change enables a hermetic PATH, but still
uses host's sysroot for system libraries.

Change-Id: Ifaa65baac3832647fd0938b90436b540c1ae0964
Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
---
 build.config.common           | 2 +-
 build.config.msm.vm           | 2 ++
 build.config.msm.waipio.tuivm | 1 -
 build.config.neo              | 1 -
 build.config.sxr.common       | 2 ++
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.config.common b/build.config.common
index c20b3f39dd1d..58fcf6991d3b 100644
--- a/build.config.common
+++ b/build.config.common
@@ -11,4 +11,4 @@ STOP_SHIP_TRACEPRINTK=1
 IN_KERNEL_MODULES=1
 DO_NOT_STRIP_MODULES=1
 
-HERMETIC_TOOLCHAIN=${HERMETIC_TOOLCHAIN:-0}
+HERMETIC_TOOLCHAIN=${HERMETIC_TOOLCHAIN:-1}
diff --git a/build.config.msm.vm b/build.config.msm.vm
index 5b1aa21077c8..2e7af68516fc 100644
--- a/build.config.msm.vm
+++ b/build.config.msm.vm
@@ -2,6 +2,8 @@
 # Common configuration for building kernel for Virtual Machines
 DEFCONFIG="generic_vm_defconfig"
 OPENSSL_DIR=${KERNEL_DIR}/../build/build-tools/path/linux-x86/openssl
+# Kernel platform missing aosp/1843323
+DISABLE_HERMETIC_SYSROOT=1
 
 append_cmd POST_DEFCONFIG_CMDS 'update_signing_keys_config'
 
diff --git a/build.config.msm.waipio.tuivm b/build.config.msm.waipio.tuivm
index 00ab4af6a115..7b296fd7ce00 100644
--- a/build.config.msm.waipio.tuivm
+++ b/build.config.msm.waipio.tuivm
@@ -5,7 +5,6 @@
 
 ################################################################################
 ## Variant setup
-HERMETIC_TOOLCHAIN=0
 MSM_ARCH=waipio_tuivm
 VARIANTS=(defconfig debug_defconfig)
 [ -z "${VARIANT}" ] && VARIANT=debug_defconfig
diff --git a/build.config.neo b/build.config.neo
index 6b45362d8583..e9d975e46758 100644
--- a/build.config.neo
+++ b/build.config.neo
@@ -5,7 +5,6 @@
 
 ################################################################################
 ## Variant setup
-HERMETIC_TOOLCHAIN=0
 MSM_ARCH=neo
 VARIANTS=(defconfig debug_defconfig)
 [ -z "${VARIANT}" ] && VARIANT=defconfig
diff --git a/build.config.sxr.common b/build.config.sxr.common
index f1df2f168a14..104f8618aa11 100644
--- a/build.config.sxr.common
+++ b/build.config.sxr.common
@@ -2,6 +2,8 @@
 # Common configuration for building kernel for SXR products
 DEFCONFIG="generic_sxr_defconfig"
 OPENSSL_DIR=${KERNEL_DIR}/../build/build-tools/path/linux-x86/openssl
+# Kernel platform missing aosp/1843323
+DISABLE_HERMETIC_SYSROOT=1
 
 append_cmd POST_DEFCONFIG_CMDS 'update_signing_keys_config'