build.sh: Allow building external modules in parallelandroid-t-preview-2_r0.3android-t-preview-1_r0.3android-t-beta-1_r0.3android-s-v2-beta-3_r0.5android-s-v2-beta-3_r0.4android-s-v2-beta-2_r0.5android-s-v2-beta-2_r0.4android-s-qpr3-beta-2_r0.4android-s-qpr3-beta-2_r0.3android-s-qpr3-beta-1_r0.6android-s-qpr3-beta-1_r0.5android-s-qpr3-beta-1_r0.4android-s-qpr3-beta-1_r0.3android-12.1.0_r0.5android-12.1.0_r0.4android-12.1.0_r0.21android-12.1.0_r0.20android-12.1.0_r0.15android-12.1.0_r0.14android-12.0.0_r0.41android-12.0.0_r0.40android-12.0.0_r0.35android-12.0.0_r0.34android-12.0.0_r0.25android-12.0.0_r0.24android-msm-redbull-4.19-t-preview-2android-msm-redbull-4.19-t-preview-1android-msm-redbull-4.19-t-beta-1android-msm-redbull-4.19-s-v2-beta-3android-msm-redbull-4.19-s-qpr3-beta-2android-msm-redbull-4.19-android12Landroid-msm-redbull-4.19-android12-v2-beta-2android-msm-redbull-4.19-android12-qpr1android-msm-barbet-4.19-s-v2-beta-3android-msm-barbet-4.19-s-qpr3-beta-2android-msm-barbet-4.19-android12Landroid-msm-barbet-4.19-android12-v2-beta-2android-msm-barbet-4.19-android12-qpr1

Allow external modules to be built in parallel by letting projects
provide their own makefile for building external modules.

Currently, build.sh employs a simple for loop to build and install
modules listed in EXT_MODULES. Unfortunately, this prevents parallel
compilation across modules and results in poor utilization of build
machines with multiple CPUs.

If EXT_MODULES_MAKEFILE is set to the file path of a custom makefile,
build.sh will invoke make on it with all the necessary parameters that
are needed to build and install kernel modules.

Signed-off-by: Daniel Mentz <danielmentz@google.com>
Change-Id: I357a524a831cf5a0a522fee66bc9c6afd249f1f1
(cherry picked from commit e2f698e689fcab16b15831a0cf6f5320cf30f0f6)

1 files changed, 17 insertions, 2 deletions

diff --git a/build.sh b/build.sh
index 2be333f..e6430f1 100755
--- a/build.sh
+++ b/build.sh
@@ -55,6 +55,12 @@
 #   EXT_MODULES
 #     Space separated list of external kernel modules to be build.
 #
+#   EXT_MODULES_MAKEFILE
+#     Location of a makefile to build external modules. If set, it will get
+#     called with all the necessary parameters to build and install external
+#     modules.  This allows for building them in parallel using makefile
+#     parallelization.
+#
 #   UNSTRIPPED_MODULES
 #     Space separated list of modules to be copied to <DIST_DIR>/unstripped
 #     for debugging purposes.
@@ -421,7 +427,7 @@ function create_modules_staging() {
   cp ${src_dir}/modules.order ${dest_dir}/modules.order
   cp ${src_dir}/modules.builtin ${dest_dir}/modules.builtin
 
-  if [ -n "${EXT_MODULES}" ]; then
+  if [[ -n "${EXT_MODULES}" ]] || [[ -n "${EXT_MODULES_MAKEFILE}" ]]; then
     mkdir -p ${dest_dir}/extra/
     cp -r ${src_dir}/extra/* ${dest_dir}/extra/
     (cd ${dest_dir}/ && \
@@ -930,6 +936,15 @@ if [ "${BUILD_INITRAMFS}" = "1" -o  -n "${IN_KERNEL_MODULES}" ]; then
         INSTALL_MOD_PATH=${MODULES_STAGING_DIR} "${MAKE_ARGS[@]}" modules_install)
 fi
 
+if [[ -z "${SKIP_EXT_MODULES}" ]] && [[ -n "${EXT_MODULES_MAKEFILE}" ]]; then
+  echo "========================================================"
+  echo " Building and installing external modules using ${EXT_MODULES_MAKEFILE}"
+
+  make -f "${EXT_MODULES_MAKEFILE}" KERNEL_SRC=${ROOT_DIR}/${KERNEL_DIR} \
+          O=${OUT_DIR} ${TOOL_ARGS} ${MODULE_STRIP_FLAG}                 \
+          INSTALL_MOD_PATH=${MODULES_STAGING_DIR} "${MAKE_ARGS[@]}"
+fi
+
 if [[ -z "${SKIP_EXT_MODULES}" ]] && [[ -n "${EXT_MODULES}" ]]; then
   echo "========================================================"
   echo " Building external modules and installing them into staging directory"
@@ -1060,7 +1075,7 @@ fi
 
 MODULES=$(find ${MODULES_STAGING_DIR} -type f -name "*.ko")
 if [ -n "${MODULES}" ]; then
-  if [ -n "${IN_KERNEL_MODULES}" -o -n "${EXT_MODULES}" ]; then
+  if [ -n "${IN_KERNEL_MODULES}" -o -n "${EXT_MODULES}" -o -n "${EXT_MODULES_MAKEFILE}" ]; then
     echo "========================================================"
     echo " Copying modules files"
     for FILE in ${MODULES}; do