From 414aa805a7917ea85be9552f13a7f3b7a34d7ce0 Mon Sep 17 00:00:00 2001
From: Carlos Llamas <cmllamas@google.com>
Date: Wed, 17 Nov 2021 11:46:49 -0800
Subject: [PATCH] GKI: fix forwarding of make options from scripts

Build scripts are supposed to forward command line parameters to make.
However, this got broken after wrapping some of these calls inside bash
functions. Make sure we forward these options too. Example:

  $ BUILD_KERNEL=1 ./build_slider.sh -j$(nproc) -s

Bug: 206862003
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Change-Id: I9c95119b69f1a03274d989217ecd3ec329491c59
(cherry picked from commit f8d2afac38ed4ab68c3b5aa6173a8ecd2b077e4c)
(cherry picked from commit 3045415df7b5a9db39d189e32fae83ffdeccc4bc)
---
 build_mixed.sh  | 4 ++--
 build_slider.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build_mixed.sh b/build_mixed.sh
index 9e448b3ad40f..294d8bc7bbb6 100755
--- a/build_mixed.sh
+++ b/build_mixed.sh
@@ -134,9 +134,9 @@ elif [ -z "${GKI_KERNEL_BUILD_CONFIG}" ]; then
 fi
 
 if [ -n "${GKI_KERNEL_BUILD_CONFIG}" ]; then
-  build_gki
+  build_gki "$@"
 else
   copy_gki_prebuilts
 fi
 
-build_device_kernel
+build_device_kernel "$@"
diff --git a/build_slider.sh b/build_slider.sh
index 823dfe53a724..471e8fcf96a4 100755
--- a/build_slider.sh
+++ b/build_slider.sh
@@ -80,7 +80,7 @@ DEVICE_KERNEL_BUILD_CONFIG=${DEVICE_KERNEL_BUILD_CONFIG} \
   GKI_KERNEL_OUT_DIR=${GKI_KERNEL_OUT_DIR} \
   GKI_KERNEL_PREBUILTS_DIR=${GKI_KERNEL_PREBUILTS_DIR} \
   GKI_DEFCONFIG_FRAGMENT=${GKI_DEFCONFIG_FRAGMENT} \
-  ./build_mixed.sh
+  ./build_mixed.sh "$@"
 
 exit_if_error $? "Failed to create mixed build"