Update to 26.0.1.

4 files changed, 11 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6cfd0c85333e..d1eda9591bd9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,23 @@
 # Generated by mksrcinfo v8
-# Fri Mar 10 02:48:13 UTC 2017
+# Wed Apr 19 07:21:44 UTC 2017
 pkgbase = android-sdk-dummy
 	pkgdesc = Google Android SDK, dummy package
-	pkgver = 25.2.5
+	pkgver = 26.0.1
 	pkgrel = 1
 	url = https://developer.android.com/studio/releases/sdk-tools.html
 	install = android-sdk-dummy.install
 	arch = i686
 	arch = x86_64
 	license = custom
-	optdepends = android-udev: udev rules for Android devices
+	optdepends = android-emulator: emulator has become standalone since 25.3.0
 	optdepends = android-sdk-platform-tools: adb, aapt, aidl, dexdump and dx
+	optdepends = android-udev: udev rules for Android devices
 	provides = android-sdk
 	conflicts = android-sdk
-	source = android-sdk.png
-	source = android-sdk.desktop::https://aur.archlinux.org/cgit/aur.git/plain/android-sdk.desktop?h=android-sdk
 	source = android-sdk.sh::https://aur.archlinux.org/cgit/aur.git/plain/android-sdk.sh?h=android-sdk
 	source = android-sdk.csh::https://aur.archlinux.org/cgit/aur.git/plain/android-sdk.csh?h=android-sdk
 	source = android-sdk.conf::https://aur.archlinux.org/cgit/aur.git/plain/android-sdk.conf?h=android-sdk
 	source = license.html::https://aur.archlinux.org/cgit/aur.git/plain/license.html?h=android-sdk
-	sha1sums = 429cfcb7c161e5fd60c9f155a6436ba5c78f7af7
-	sha1sums = 8f886de363ad91a7f93a0c6ded993e99bef3e1a7
 	sha1sums = 30a6ed281d54f8b7be08663a18c367f79c0d8d47
 	sha1sums = 1bd09bf137fd09171cb426daa5748f117cfb3c25
 	sha1sums = 145bdf3eb41a56574b289c1577a24bc47097ec83
diff --git a/PKGBUILD b/PKGBUILD
index b73b52579bfa..775b705b3afb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 
 # Taken from android-sdk
 
-pkgname=android-sdk-dummy
 _pkgname=android-sdk
-pkgver=25.2.5
+pkgname="${_pkgname}-dummy"
+pkgver=26.0.1
 pkgrel=1
 pkgdesc='Google Android SDK, dummy package'
 arch=('i686' 'x86_64')
@@ -16,20 +16,17 @@ depends_x86_64=('java-environment' 'lib32-alsa-lib' 'lib32-openal'
                'lib32-libstdc++5' 'lib32-libxv' 'lib32-mesa' 'lib32-ncurses'
                'lib32-sdl' 'lib32-zlib' 'lib32-fontconfig' 'lib32-libpulse'
                'swt')
-optdepends=('android-udev: udev rules for Android devices'
-            'android-sdk-platform-tools: adb, aapt, aidl, dexdump and dx')
+optdepends=('android-emulator: emulator has become standalone since 25.3.0'
+            'android-sdk-platform-tools: adb, aapt, aidl, dexdump and dx'
+            'android-udev: udev rules for Android devices')
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
 install="${pkgname}.install"
-source=("${_pkgname}.png"
-        "${_pkgname}.desktop::https://aur.archlinux.org/cgit/aur.git/plain/${_pkgname}.desktop?h=${_pkgname}"
-        "${_pkgname}.sh::https://aur.archlinux.org/cgit/aur.git/plain/${_pkgname}.sh?h=${_pkgname}"
+source=("${_pkgname}.sh::https://aur.archlinux.org/cgit/aur.git/plain/${_pkgname}.sh?h=${_pkgname}"
         "${_pkgname}.csh::https://aur.archlinux.org/cgit/aur.git/plain/${_pkgname}.csh?h=${_pkgname}"
         "${_pkgname}.conf::https://aur.archlinux.org/cgit/aur.git/plain/${_pkgname}.conf?h=${_pkgname}"
         "license.html::https://aur.archlinux.org/cgit/aur.git/plain/license.html?h=${_pkgname}")
-sha1sums=('429cfcb7c161e5fd60c9f155a6436ba5c78f7af7'
-          '8f886de363ad91a7f93a0c6ded993e99bef3e1a7'
-          '30a6ed281d54f8b7be08663a18c367f79c0d8d47'
+sha1sums=('30a6ed281d54f8b7be08663a18c367f79c0d8d47'
           '1bd09bf137fd09171cb426daa5748f117cfb3c25'
           '145bdf3eb41a56574b289c1577a24bc47097ec83'
           'bfb91be7e0b602d765b7a1fcaf0ce1b7e1a93faa')
@@ -38,7 +35,5 @@ 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 "${_pkgname}.png" "${pkgdir}/usr/share/pixmaps/${_pkgname}.png"
-  install -Dm644 "${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
   install -Dm644 license.html "${pkgdir}/usr/share/licenses/${_pkgname}/license.html"
 }
diff --git a/android-sdk-dummy.install b/android-sdk-dummy.install
index 38d850daeeae..7ab2e0fec360 100644
--- a/android-sdk-dummy.install
+++ b/android-sdk-dummy.install
@@ -1,4 +1,3 @@
 post_install() {
-  echo 'You need to remove /opt/android-sdk/tools/lib{,64}/libstdc++/ for emulator to work.'
   echo 'You need to source /etc/profile or relogin to add the Android SDK tools to your path.'
 }
diff --git a/android-sdk.png b/android-sdk.png
deleted file mode 100644
index aee44e138434..000000000000
--- a/android-sdk.png
+++ /dev/null