Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit cec36153 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Alistair Strachan
Browse files

ANDROID: Makefile: Properly resolve 4.14.112 merge



The merge removed commit 9ff6ab2f ("ANDROID: Kbuild, LLVMLinux:
allow overriding clang target triple").

This keeps commit 1efb2cae ("kbuild: clang: choose GCC_TOOLCHAIN_DIR
not on LD"), which caused the conflict.

Change-Id: I72b7f69204a801ff6ef6405e24317a7b08428901
Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
parent d9a62b43
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment