allow gradle/sdkmanager to discover NDK

Also merges lilac.py into lilac.yaml

2 files changed, 6 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 22d2ab341787..b6cdef89aa32 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = android-ndk
 	pkgdesc = Android C/C++ developer kit
 	pkgver = r22
-	pkgrel = 1
+	pkgrel = 2
 	url = https://developer.android.com/ndk/
 	install = android-ndk.install
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 4ed65e471c10..5e8ec441e94f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=android-ndk
 pkgver=r22
-pkgrel=1
+pkgrel=2
 pkgdesc='Android C/C++ developer kit'
 arch=('x86_64')
 url='https://developer.android.com/ndk/'
@@ -33,4 +33,8 @@ package() {
   mv "$pkgname-${pkgver/./}" "$pkgdir/opt/$pkgname"
 
   install -Dm644 $pkgname.sh -t "$pkgdir/etc/profile.d/"
+
+  # make sdkmanager and gradle recognize NDK
+  install -Ddm755 "$pkgdir"/opt/android-sdk
+  ln -s /opt/$pkgname "$pkgdir"/opt/android-sdk/ndk-bundle
 }