Skip to content

Commit

Permalink
GKI: fix forwarding of make options from scripts
Browse files Browse the repository at this point in the history
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 <[email protected]>
Change-Id: I9c95119b69f1a03274d989217ecd3ec329491c59
(cherry picked from commit f8d2afac38ed4ab68c3b5aa6173a8ecd2b077e4c)
(cherry picked from commit 3045415)
  • Loading branch information
Carlos Llamas authored and Robin Peng committed Dec 13, 2021
1 parent 7571c51 commit 414aa80
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions build_mixed.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$@"
2 changes: 1 addition & 1 deletion build_slider.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit 414aa80

Please sign in to comment.