Adopt, use system packages and fix building issues

3 files changed, 14 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5c779cfb177c..64aa447e8481 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Mon Jan  2 17:41:37 UTC 2017
 pkgbase = fb-adb-git
 	pkgdesc = A better shell to use in place of adb when connecting to Android devices
-	pkgver = 20161201.r353.c6e6e4d
+	pkgver = 20170417.r359.0cc0534
 	pkgrel = 1
 	url = https://github.com/facebook/fb-adb
 	arch = x86_64
@@ -10,15 +8,14 @@ pkgbase = fb-adb-git
 	makedepends = git
 	makedepends = vim
 	makedepends = android-sdk-build-tools
+	makedepends = android-platform-19
 	depends = android-tools
 	options = !strip
 	options = !buildflags
 	source = git+https://github.com/facebook/fb-adb.git
-	source = https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
+	source = fix-build.patch::https://github.com/facebook/fb-adb/pull/59.patch
 	sha512sums = SKIP
-	sha512sums = 96fb71d78a8c2833afeba6df617edcd6cc4e37ecd0c3bec38c39e78204ed3c2bd54b138a56086bf5ccd95e372e3c36e72c1550c13df8232ec19537da93049284
-	source_x86_64 = http://dl.google.com/android/repository/android-ndk-r12-linux-x86_64.zip
-	sha512sums_x86_64 = 1c47dcdc2c4ae1c0e5dd5c1ac349e043fa186f238c9cbfed567dcc9deb0b1d597c985611303f688f7c561144c26cdc9e471fb20c5447cd799ec883ba63aa2472
+	sha512sums = 9f18e251c864acd94d73357e2c8f48e29946498d46e04ac7d518844fea6f774ea066292f3068088bd46c1283d7a642abf52a270990d0fc0f909d10bd4c3053c3
 
 pkgname = fb-adb-git
 
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index e35759ab7bf1..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*.pkg.tar.xz
-*.tgz
-*.zip
-pkg
-src
-fb-adb
diff --git a/PKGBUILD b/PKGBUILD
index 34bc6dd82d2a..cfd7b25a4ddd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,30 +2,19 @@
 
 _pkgname=fb-adb
 pkgname=$_pkgname-git
-pkgver=20161201.r353.c6e6e4d
+pkgver=20170417.r359.0cc0534
 pkgrel=1
 pkgdesc='A better shell to use in place of adb when connecting to Android devices'
 url='https://github.com/facebook/fb-adb'
 license=('GPL3')
 arch=('x86_64')
 depends=('android-tools')
-makedepends=('git' 'vim' 'android-sdk-build-tools')
+makedepends=('git' 'vim' 'android-sdk-build-tools' 'android-platform-19')
 options=('!strip' '!buildflags')
-source=("git+$url.git")
-sha512sums=('SKIP')
-sha512sums=('SKIP')
-_ndkver=12
-_sdkver=24.4.1
-
-if [[ -z "$ANDROID_NDK" ]]; then
-  source_x86_64+=("http://dl.google.com/android/repository/android-ndk-r$_ndkver-linux-x86_64.zip")
-  sha512sums_x86_64+=('1c47dcdc2c4ae1c0e5dd5c1ac349e043fa186f238c9cbfed567dcc9deb0b1d597c985611303f688f7c561144c26cdc9e471fb20c5447cd799ec883ba63aa2472')
-fi
-
-if [[ -z "$ANDROID_SDK" ]]; then
-  source+=("https://dl.google.com/android/android-sdk_r$_sdkver-linux.tgz")
-  sha512sums+=('96fb71d78a8c2833afeba6df617edcd6cc4e37ecd0c3bec38c39e78204ed3c2bd54b138a56086bf5ccd95e372e3c36e72c1550c13df8232ec19537da93049284')
-fi
+source=("git+$url.git"
+        "fix-build.patch"::"https://github.com/facebook/fb-adb/pull/59.patch")
+sha512sums=('SKIP'
+            '9f18e251c864acd94d73357e2c8f48e29946498d46e04ac7d518844fea6f774ea066292f3068088bd46c1283d7a642abf52a270990d0fc0f909d10bd4c3053c3')
 
 pkgver() {
   cd $_pkgname
@@ -33,22 +22,12 @@ pkgver() {
 }
 
 prepare() {
-  if [[ -z "$ANDROID_SDK" ]]; then
-    cd android-sdk-linux
-    ln -sf /opt/android-sdk/build-tools build-tools
-    (while :; do printf '%s\n' 'y'; sleep 2; done) | ./tools/android update sdk --no-ui
-  fi
+  cd $_pkgname
+
+  patch -Np1 -i ../fix-build.patch
 }
 
 build() {
-  if [[ -z "$ANDROID_NDK" ]]; then
-    export ANDROID_NDK="$srcdir/android-ndk-r$_ndkver"
-  fi
-
-  if [[ -z "$ANDROID_SDK" ]]; then
-    export ANDROID_SDK="$srcdir/android-sdk-linux"
-  fi
-
   # configure
   cd $_pkgname
   ./autogen.sh
@@ -56,7 +35,7 @@ build() {
   # build
   install -d build
   cd build
-  ../configure --enable-checking=yes
+  ../configure --enable-checking=yes --with-android-sdk="$ANDROID_HOME"
   make
 }