aurget.sh - pull in android-sdk-25.2.3-1 from AUR at commit 15076c980…

…4f67418f69e9f368e45691fdec3d4b1

android-sdk/.SRCINFO

@@ -1,26 +1,28 @@
+# Generated by mksrcinfo v8
+# Sun Nov 27 17:49:47 UTC 2016
 pkgbase = android-sdk
 	pkgdesc = Google Android SDK
-	pkgver = 24.4.1
+	pkgver = 25.2.3
 	pkgrel = 1
-	url = http://developer.android.com/sdk/
+	url = https://developer.android.com/studio/releases/sdk-tools.html
 	install = android-sdk.install
 	arch = x86_64
 	arch = i686
 	license = custom
 	optdepends = android-udev: udev rules for Android devices
 	optdepends = android-sdk-platform-tools: adb, aapt, aidl, dexdump and dx
-	source = https://dl.google.com/android/repository/tools_r24.4.1-linux.zip
-	source = https://developer.android.com/assets/images/android_logo.png
+	source = https://dl.google.com/android/repository/tools_r25.2.3-linux.zip
+	source = https://source.android.com/source/images/Android_Robot_100.png
 	source = android-sdk.desktop
 	source = android-sdk.sh
 	source = android-sdk.csh
 	source = android-sdk.conf
 	source = license.html
-	sha1sums = 7e00ea3715f2cf666296ce22058764ec7ecb3b7e
-	sha1sums = b8726c63294a23e5fea066a36061164e583b5732
-	sha1sums = e834f53e13d5926ec7be3fd775fa80aa6f328eb6
-	sha1sums = 78f8574e651c9bf8b7515ecb30c7ef93edbc4a96
-	sha1sums = 08c85aab7523e22b298891c7047bc0e7adbf3437
+	sha1sums = aafe7f28ac51549784efc2f3bdfc620be8a08213
+	sha1sums = f359ac923ed008dae3a007a513d26cfbaf025626
+	sha1sums = 8f886de363ad91a7f93a0c6ded993e99bef3e1a7
+	sha1sums = ab7251df3a382a920e81663f25d4a7813918ae1c
+	sha1sums = 5430d75f38ff74667919efc13f380bef0d67e8ff
 	sha1sums = 145bdf3eb41a56574b289c1577a24bc47097ec83
 	sha1sums = bfb91be7e0b602d765b7a1fcaf0ce1b7e1a93faa
 	depends_x86_64 = java-environment

android-sdk/PKGBUILD

@@ -1,13 +1,13 @@
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# 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=24.4.1
+pkgver=25.2.3
 pkgrel=1
 pkgdesc='Google Android SDK'
 arch=('x86_64' 'i686')
-url='http://developer.android.com/sdk/'
+url='https://developer.android.com/studio/releases/sdk-tools.html'
 license=('custom')
 depends_x86_64=('java-environment' 'lib32-alsa-lib' 'lib32-openal'
   'lib32-libstdc++5' 'lib32-libxv' 'lib32-mesa' 'lib32-ncurses' 'lib32-sdl'
@@ -18,25 +18,25 @@ install="$pkgname.install"
 optdepends=('android-udev: udev rules for Android devices'
             'android-sdk-platform-tools: adb, aapt, aidl, dexdump and dx')
 source=("https://dl.google.com/android/repository/tools_r${pkgver}-linux.zip"
-        'https://developer.android.com/assets/images/android_logo.png'
+        'https://source.android.com/source/images/Android_Robot_100.png'
         "$pkgname.desktop"
         "$pkgname.sh"
         "$pkgname.csh"
         "$pkgname.conf"
         'license.html')
-sha1sums=('7e00ea3715f2cf666296ce22058764ec7ecb3b7e'
-          'b8726c63294a23e5fea066a36061164e583b5732'
-          'e834f53e13d5926ec7be3fd775fa80aa6f328eb6'
-          '78f8574e651c9bf8b7515ecb30c7ef93edbc4a96'
-          '08c85aab7523e22b298891c7047bc0e7adbf3437'
+sha1sums=('aafe7f28ac51549784efc2f3bdfc620be8a08213'
+          'f359ac923ed008dae3a007a513d26cfbaf025626'
+          '8f886de363ad91a7f93a0c6ded993e99bef3e1a7'
+          'ab7251df3a382a920e81663f25d4a7813918ae1c'
+          '5430d75f38ff74667919efc13f380bef0d67e8ff'
           '145bdf3eb41a56574b289c1577a24bc47097ec83'
           'bfb91be7e0b602d765b7a1fcaf0ce1b7e1a93faa')
 
 package() {
   install -Dm755 "$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh"
   install -Dm755 "$pkgname.csh" "$pkgdir/etc/profile.d/$pkgname.csh"
   install -Dm644 "$pkgname.conf" "$pkgdir/etc/ld.so.conf.d/$pkgname.conf"
-  install -Dm644 android_logo.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -Dm644 Android_Robot_100.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
   install -Dm644 "$pkgname.desktop" \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
   install -Dm644 license.html \
@@ -47,15 +47,22 @@ 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
   chmod -R o=g "$pkgdir/opt/$pkgname"
   find "$pkgdir/opt/$pkgname" -perm 744 -exec chmod 755 {} +
+
+  # Remove libstd* from the tools directory
+  for kw in libstd; do
+    find "$pkgdir/opt/$pkgname/tools" -name "$kw*" -type f -delete
+  done
 }
 
 # getver: developer.android.com/tools/sdk/tools-notes.html
+# see https://dl.google.com/android/repository/repository-11.xml for new versions
 # vim:set ts=2 sw=2 et:

android-sdk/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

android-sdk/android-sdk.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Android SDK
-Comment=Android Sofware Development Kit
+Comment=Android Software Development Kit
 Exec=android
 Icon=android-sdk
 Terminal=false

android-sdk/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