diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2020-08-19 02:25:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-19 02:25:30 +0300 |
| commit | c73aa699d6608474033e9a8a1a49d2830e2d2fcc (patch) | |
| tree | 5c253ecc43bd20a2f99802648b7d9ff63c5ff579 /sdks | |
| parent | 746ece2e0f1d4a05bf27a26b44fe25bf8cbee86b (diff) | |
Support overriding SDK_DIR/NDK_DIR in sdks/android/Makefile
We need this for the new Jenkins Android emulator plugin since it uses a different adb version than what we have in $(ANDROID_TOOLCHAIN_DIR)/sdk.
Diffstat (limited to 'sdks')
| -rw-r--r-- | sdks/android/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sdks/android/Makefile b/sdks/android/Makefile index 03bf58a1ca3..81e978b61f0 100644 --- a/sdks/android/Makefile +++ b/sdks/android/Makefile @@ -5,8 +5,8 @@ include $(TOP)/sdks/paths.mk UNAME=$(shell uname) -SDK_DIR = $(ANDROID_TOOLCHAIN_DIR)/sdk -NDK_DIR = $(ANDROID_TOOLCHAIN_DIR)/ndk +SDK_DIR = $(or $(ANDROID_SDK_ROOT),$(ANDROID_TOOLCHAIN_DIR)/sdk) +NDK_DIR = $(or $(ANDROID_NDK_ROOT),$(ANDROID_TOOLCHAIN_DIR)/ndk) ADB = $(SDK_DIR)/platform-tools/adb |