ci: Set legacy ANDROID_HOME because ndk-build prefers deprecated var

rust-mobile · Nov 7, 2020 · f0fc14b · f0fc14b
1 parent b89ecba
commit f0fc14b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -87,8 +87,10 @@ jobs:
  echo "ANDROID_SDK_ROOT=$sdk_root" >> $env:GITHUB_ENV
  echo "ANDROID_NDK_ROOT=$sdk_root\ndk-bundle" >> $env:GITHUB_ENV
 
+ # Update legacy path for ndk-build:
+ echo "ANDROID_HOME=$sdk_root" >> $env:GITHUB_ENV
+
  # Unset legacy paths:
- echo "ANDROID_HOME=" >> $env:GITHUB_ENV
  echo "ANDROID_NDK_HOME=" >> $env:GITHUB_ENV
  echo "ANDROID_NDK_PATH=" >> $env:GITHUB_ENV
 

diff --git a/ndk-build/src/ndk.rs b/ndk-build/src/ndk.rs
@@ -17,7 +17,7 @@ impl Ndk {
  let mut sdk_path = std::env::var("ANDROID_HOME").ok();
  if sdk_path.is_some() {
  println!(
- "Warning: You use environment variable ANDROID_HOME that is deprecated.\
+ "Warning: You use environment variable ANDROID_HOME that is deprecated. \
  Please, remove it and use ANDROID_SDK_ROOT instead. Now ANDROID_HOME is used"
  );
  }