Set ANDROID_SDK_ROOT in addition to the old ANDROID_HOME.

4 files changed, 8 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e10e86afccd6..62a4284016d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = android-sdk-cmdline-tools-latest
 	pkgdesc = Android SDK Command-line Tools (latest)
 	pkgver = 6.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://developer.android.com/studio
 	install = android-sdk-cmdline-tools-latest.install
 	arch = x86_64
@@ -16,7 +16,7 @@ pkgbase = android-sdk-cmdline-tools-latest
 	source = android-sdk-cmdline-tools-latest.sh
 	source = android-sdk-cmdline-tools-latest.csh
 	sha1sums = 8d47ab9a90caa60ce8a95d7e384ec64633bc13b4
-	sha1sums = d16076f0a7cbc78605b5669d0928963a9866e7f4
-	sha1sums = 3e844b22bfcbc159280c5f9e8dfb07ff9559dde5
+	sha1sums = cbcfb844067eb40d7cab029c481f3f94f31f0518
+	sha1sums = f71b94781633743850c760322dc3b370bc63fcaa
 
 pkgname = android-sdk-cmdline-tools-latest
diff --git a/PKGBUILD b/PKGBUILD
index 5779ddc0f135..023fdc87a579 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=android-sdk-cmdline-tools-latest
 pkgver=6.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Android SDK Command-line Tools (latest)'
 arch=('x86_64' 'i686')
 url='https://developer.android.com/studio'
@@ -16,8 +16,8 @@ source=('https://dl.google.com/android/repository/commandlinetools-linux-8092744
         "${pkgname}.sh"
         "${pkgname}.csh")
 sha1sums=('8d47ab9a90caa60ce8a95d7e384ec64633bc13b4'
-          'd16076f0a7cbc78605b5669d0928963a9866e7f4'
-          '3e844b22bfcbc159280c5f9e8dfb07ff9559dde5')
+          'cbcfb844067eb40d7cab029c481f3f94f31f0518'
+          'f71b94781633743850c760322dc3b370bc63fcaa')
 
 package() {
   mkdir -p "${pkgdir}/opt/android-sdk/cmdline-tools/"
diff --git a/android-sdk-cmdline-tools-latest.csh b/android-sdk-cmdline-tools-latest.csh
index af7eaaa50bf0..4603f01c7e4c 100644
--- a/android-sdk-cmdline-tools-latest.csh
+++ b/android-sdk-cmdline-tools-latest.csh
@@ -1,2 +1,3 @@
 setenv ANDROID_HOME '/opt/android-sdk'
+setenv ANDROID_SDK_ROOT '/opt/android-sdk'
 setenv PATH "${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin"
diff --git a/android-sdk-cmdline-tools-latest.sh b/android-sdk-cmdline-tools-latest.sh
index b002c0fa11cb..cfd9695780da 100644
--- a/android-sdk-cmdline-tools-latest.sh
+++ b/android-sdk-cmdline-tools-latest.sh
@@ -1,2 +1,3 @@
 export ANDROID_HOME='/opt/android-sdk'
+export ANDROID_SDK_ROOT='/opt/android-sdk'
 export PATH="${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin"