| commit | 1b103290a3678ba1ff0ed0801c1641d3fec9c1c1 | [log] [tgz] |
|---|---|---|
| author | Nathan Chancellor <natechancellor@gmail.com> | Wed Apr 17 10:52:26 2019 -0700 |
| committer | Alistair Strachan <astrachan@google.com> | Thu Apr 18 18:27:16 2019 +0000 |
| tree | 4c176738071281270cff4f5e89addb4aa34e8194 | |
| parent | 68e9a46be20d2f81819d57b55380bb3e3a0ae0dd [diff] |
ANDROID: Makefile: Properly resolve 4.19.35 merge
The merge removed commit 4c451dba25d2 ("ANDROID: Kbuild, LLVMLinux:
allow overriding clang target triple").
This keeps commit f66a52d991de ("kbuild: clang: choose GCC_TOOLCHAIN_DIR
not on LD"), which caused the conflict.
Change-Id: I72b7f69204a801ff6ef6405e24317a7b08428901
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>