Browse Source

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 <[email protected]>
Elliot Berman 3 years ago
parent
commit
9e2b44ffb2
5 changed files with 5 additions and 3 deletions
  1. 1 1
      build.config.common
  2. 2 0
      build.config.msm.vm
  3. 0 1
      build.config.msm.waipio.tuivm
  4. 0 1
      build.config.neo
  5. 2 0
      build.config.sxr.common

+ 1 - 1
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}

+ 2 - 0
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'
 

+ 0 - 1
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

+ 0 - 1
build.config.neo

@@ -5,7 +5,6 @@
 
 ################################################################################
 ## Variant setup
-HERMETIC_TOOLCHAIN=0
 MSM_ARCH=neo
 VARIANTS=(defconfig debug_defconfig)
 [ -z "${VARIANT}" ] && VARIANT=defconfig

+ 2 - 0
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'