| commit | 93cf2529304f205b728a89fee40dfbd7d507a361 | [log] [tgz] |
|---|---|---|
| author | Nathan Chancellor <natechancellor@gmail.com> | Wed Apr 17 10:52:26 2019 -0700 |
| committer | Nathan Chancellor <natechancellor@gmail.com> | Wed Apr 17 11:07:27 2019 -0700 |
| tree | aa864b6a10c8631c0fa560bb8c4c87c02de9a922 | |
| parent | fe293dc2ab3c17ebcb3e135649d415ed02cc05c3 [diff] |
ANDROID: Makefile: Properly resolve 4.14.112 merge
The merge removed commit b9b964626ea8 ("ANDROID: Kbuild, LLVMLinux:
allow overriding clang target triple").
This keeps commit 1efb2caed0ad ("kbuild: clang: choose GCC_TOOLCHAIN_DIR
not on LD"), which caused the conflict.
Change-Id: I72b7f69204a801ff6ef6405e24317a7b08428901
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>