update by lilac

3 files changed, 17 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fa20c97ed1ce..aa072b0e7d2e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = android-ndk-beta
 	pkgdesc = Android C/C++ developer kit (beta)
-	pkgver = r18_beta1
+	pkgver = r18_beta2
 	pkgrel = 2
 	url = https://developer.android.com/ndk/
 	install = android-ndk-beta.install
@@ -14,9 +14,11 @@ pkgbase = android-ndk-beta
 	options = staticlibs
 	backup = etc/profile.d/android-ndk-beta.sh
 	source = android-ndk-beta.sh
-	source = https://dl.google.com/android/repository/android-ndk-r18-beta1-linux-x86_64.zip
-	sha256sums = cadefdccf5da51dc56156fbc41945a2c27d913d12a043b32f47e15f253b0943d
-	sha256sums = c9fe5b5102a596d3f8ee65f26e34a5bc994b2ca8bfa5a884444205201324f4c2
+	sha1sums = b0a3c3d4e148c1049f9c8b12f2632840630ea4db
+	sha256sums = a39422d48174302e1ee27f07031f20adc78224d12c17a5451129a88b47c901c1
+	source_x86_64 = https://dl.google.com/android/repository/android-ndk-r18-beta2-linux-x86_64.zip
+	sha1sums_x86_64 = 0bc218b4212ed30a31904dc75ffead6ecc9bbd30
+	sha256sums_x86_64 = 4b1f7c588788aee43ee6e2de07f3d9988610f59644ba73175627573147525b36
 
 pkgname = android-ndk-beta
 
diff --git a/PKGBUILD b/PKGBUILD
index 6d1648728cc5..2798d9fed14e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,22 +5,26 @@
 
 pkgname=android-ndk-beta
 _pkgname=${pkgname/-beta*/}
-pkgver=r18_beta1
+pkgver=r18_beta2
 pkgrel=2
 pkgdesc='Android C/C++ developer kit (beta)'
 arch=('x86_64')
 url='https://developer.android.com/ndk/'
 license=('GPL' 'LGPL' 'custom')
 options=('!strip' 'staticlibs')
-backup=('etc/profile.d/android-ndk-beta.sh')
+backup=("etc/profile.d/$pkgname.sh")
 install="$pkgname.install"
 depends=('glibc')
 optdepends=(
   'python: various helper scripts'
 )
-source=('android-ndk-beta.sh' "https://dl.google.com/android/repository/${_pkgname}-${pkgver/_/-}-linux-x86_64.zip")
-sha256sums=('cadefdccf5da51dc56156fbc41945a2c27d913d12a043b32f47e15f253b0943d'
-            'c9fe5b5102a596d3f8ee65f26e34a5bc994b2ca8bfa5a884444205201324f4c2')
+source=("$pkgname.sh")
+source_x86_64=("https://dl.google.com/android/repository/${_pkgname}-${pkgver/_/-}-linux-x86_64.zip")
+# SHA1 sums is kept to follow upstream releases https://github.com/android-ndk/ndk/issues/673
+sha1sums=('b0a3c3d4e148c1049f9c8b12f2632840630ea4db')
+sha1sums_x86_64=('0bc218b4212ed30a31904dc75ffead6ecc9bbd30')
+sha256sums=('a39422d48174302e1ee27f07031f20adc78224d12c17a5451129a88b47c901c1')
+sha256sums_x86_64=('4b1f7c588788aee43ee6e2de07f3d9988610f59644ba73175627573147525b36')
 
 package() {
   install -d "$pkgdir/opt"
@@ -33,4 +37,4 @@ package() {
   ln -s /opt/$pkgname "$pkgdir"/opt/android-sdk/ndk-bundle
 }
 
-# vim:set ts=2 sw=2 et:
+# vim: set ts=2 sw=2 et ft=sh:
diff --git a/android-ndk-beta.sh b/android-ndk-beta.sh
index 3af88a6f31c6..d80a2680cc91 100644
--- a/android-ndk-beta.sh
+++ b/android-ndk-beta.sh
@@ -1,4 +1,4 @@
-export PATH=$PATH:/opt/android-ndk-beta
+export PATH="$PATH:/opt/android-ndk-beta"
 export ANDROID_NDK=/opt/android-ndk-beta
 # Some programs such as gradle ask this as well:
 export ANDROID_NDK_HOME=/opt/android-ndk-beta