summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander F Rødseth2016-06-30 16:06:54 +0200
committerAlexander F Rødseth2016-06-30 16:06:54 +0200
commitbec84eb8cf837ef0b8af504cdac4f267703c48c8 (patch)
tree4575d4e3fd0c5dc611a0c31197487ebcf53ada60
parentd59ecdc700ef9f9e09b5d385342e9188c7b13b62 (diff)
downloadaur-bec84eb8cf837ef0b8af504cdac4f267703c48c8.tar.gz
Unset ANDROID_SWT
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD15
-rw-r--r--android-sdk.csh2
-rw-r--r--android-sdk.sh2
4 files changed, 14 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a95bcecebee1..b24f36db2672 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Jun 5 11:53:48 UTC 2016
+# Thu Jun 30 14:06:37 UTC 2016
pkgbase = android-sdk
pkgdesc = Google Android SDK
pkgver = 25.1.7
- pkgrel = 2
+ pkgrel = 3
url = http://developer.android.com/sdk/
install = android-sdk.install
arch = x86_64
@@ -21,8 +21,8 @@ pkgbase = android-sdk
sha1sums = 36869e6c81cda18f862959a92301761f81bc06b8
sha1sums = f359ac923ed008dae3a007a513d26cfbaf025626
sha1sums = 8f886de363ad91a7f93a0c6ded993e99bef3e1a7
- sha1sums = 78f8574e651c9bf8b7515ecb30c7ef93edbc4a96
- sha1sums = 08c85aab7523e22b298891c7047bc0e7adbf3437
+ sha1sums = ab7251df3a382a920e81663f25d4a7813918ae1c
+ sha1sums = 5430d75f38ff74667919efc13f380bef0d67e8ff
sha1sums = 145bdf3eb41a56574b289c1577a24bc47097ec83
sha1sums = bfb91be7e0b602d765b7a1fcaf0ce1b7e1a93faa
depends_x86_64 = java-environment
diff --git a/PKGBUILD b/PKGBUILD
index 11e6b697302b..abe787db6205 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
# Maintainer: Alexander F Rødseth <xyproto@archlinux.org>
# Contributor: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Gordin <9ordin @t gmail dot com>
+# Contributor: Gordin <9ordin@gmail.com>
pkgname=android-sdk
pkgver=25.1.7
-pkgrel=2
+pkgrel=3
pkgdesc='Google Android SDK'
arch=('x86_64' 'i686')
url='http://developer.android.com/sdk/'
@@ -27,8 +27,8 @@ source=("https://dl.google.com/android/repository/tools_r${pkgver}-linux.zip"
sha1sums=('36869e6c81cda18f862959a92301761f81bc06b8'
'f359ac923ed008dae3a007a513d26cfbaf025626'
'8f886de363ad91a7f93a0c6ded993e99bef3e1a7'
- '78f8574e651c9bf8b7515ecb30c7ef93edbc4a96'
- '08c85aab7523e22b298891c7047bc0e7adbf3437'
+ 'ab7251df3a382a920e81663f25d4a7813918ae1c'
+ '5430d75f38ff74667919efc13f380bef0d67e8ff'
'145bdf3eb41a56574b289c1577a24bc47097ec83'
'bfb91be7e0b602d765b7a1fcaf0ce1b7e1a93faa')
@@ -47,9 +47,10 @@ package() {
cp -a tools "$pkgdir/opt/$pkgname"
if [[ $CARCH = i686 ]]; then
- rm -rf ${pkgdir}/opt/android-sdk/tools/lib/{monitor-,}x86_64 \
- ${pkgdir}/opt/android-sdk/tools/lib/lib64* \
- ${pkgdir}/opt/android-sdk/tools/emulator64-*
+ rm -rf \
+ "${pkgdir}"/opt/android-sdk/tools/lib/{monitor-,}x86_64 \
+ "${pkgdir}"/opt/android-sdk/tools/lib/lib64* \
+ "${pkgdir}"/opt/android-sdk/tools/emulator64-*
fi
# Fix broken permissions
diff --git a/android-sdk.csh b/android-sdk.csh
index ef846cf652be..b5c6cb583fa2 100644
--- a/android-sdk.csh
+++ b/android-sdk.csh
@@ -1,3 +1,3 @@
setenv ANDROID_HOME /opt/android-sdk
-setenv ANDROID_SWT /usr/share/java
+#setenv ANDROID_SWT /usr/share/java
setenv PATH ${PATH}:${ANDROID_HOME}/tools
diff --git a/android-sdk.sh b/android-sdk.sh
index a4e90f0fc7e4..c96bfeee474b 100644
--- a/android-sdk.sh
+++ b/android-sdk.sh
@@ -1,3 +1,3 @@
export ANDROID_HOME=/opt/android-sdk
-export ANDROID_SWT=/usr/share/java
+#export ANDROID_SWT=/usr/share/java
export PATH=$PATH:$ANDROID_HOME/tools