diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2020-08-19 02:25:30 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2020-09-04 17:35:10 +0300 |
| commit | 32c0b1aaf9e9351aaff6f028787a525dac94036a (patch) | |
| tree | 495833f5a97829f9ba72c464ada0b760e6b6c5cf | |
| parent | 620cf538206fe0f8cd63d76c502149b331f56f51 (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.
(cherry picked from commit c73aa699d6608474033e9a8a1a49d2830e2d2fcc)
(cherry picked from commit 07e2ed77083e5c7a287de33e8b93ad6a128490a5)
| -rw-r--r-- | sdks/android/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sdks/android/Makefile b/sdks/android/Makefile index 03bf58a1ca3..ef9550e209a 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 @@ -62,7 +62,7 @@ shell: .PHONY: accept-android-license accept-android-license: - yes | $(SDK_DIR)/tools/bin/sdkmanager --licenses + yes | $(SDK_DIR)/tools/bin/sdkmanager --sdk_root=$(SDK_DIR) --licenses ## Check targets |