| commit | 5d68df32998cd6e900ccc6d0b1a0c9d45125506f | [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:19 2019 +0000 |
| tree | c20dd866679a42677dcd10bb9f078d60fae7687b | |
| parent | 50db17e52bb890e0dcaf7ab64a201b93a4555e91 [diff] |
ANDROID: Makefile: Properly resolve 4.9.169 merge
The merge removed commit 4dcb0afde6f4 ("ANDROID: Kbuild, LLVMLinux:
allow overriding clang target triple").
This keeps commit 1347aa2a4d9a ("kbuild: clang: choose GCC_TOOLCHAIN_DIR
not on LD"), which caused the conflict.
Change-Id: I72b7f69204a801ff6ef6405e24317a7b08428901
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>