5 files changed, 45 insertions, 16 deletions
diff --git a/development/android-studio/README b/development/android-studio/README
index 802eb4f440cf3..d8e02bb38a60c 100644
--- a/development/android-studio/README
+++ b/development/android-studio/README
@@ -7,7 +7,7 @@ Android Studio offers:
 
  - Flexible Gradle-based build system.
  - Build variants and multiple APK generation.
- - Expanded template support for Google Services and various 
+ - Expanded template support for Google Services and various
    device types.
  - Rich layout editor with support for theme editing.
  - Lint tools to catch performance, usability, version 
@@ -15,10 +15,38 @@ Android Studio offers:
  - ProGuard and app-signing capabilities.
  - Built-in support for Google Cloud Platform, making it easy 
    to integrate Google Cloud Messaging and App Engine.
-   
+
 After having installed this package, run Android Studio with:
   android-studio
-  
-The application would ask you for Java JDK, which is needed to 
-use it effectively; if you have JavaJDK installed it could be 
-in /usr/lib${LIBDIRSUFFIX}/java
+
+# General tips
+- google-droid-fonts package may give you font issues with IntelliJ
+  based applications (like Android Studio), and removing it should
+  suffice to fix the issues.
+- An embedded version of JDK is included in this package for
+  Android Studio, which is needed to use it effectively.
+  However, I suggest to install an independent version (available in
+  slackbuilds.org).
+  If you already have JDK installed, you may want to specify it under
+  File → Project Structure → SDK Location
+  - Uncheck "Use embedded JDK", and
+  - set the right path (likely /usr/lib/java).
+
+# No multilib systems
+Android Studio "requires" a multilib system. It is however possible
+to use PART of its functionality with a 32-bit Slackware or a
+64-bit non-multilib Slackware64.
+
+## Slackware (32-bit) tips.
+- An embedded version of JDK is included in this package for
+  Android Studio. However, it does not work in 32 bit Slackware
+  and, therefore, jdk is required (available in SlackBuild.org).
+- You unlikely can use adb.
+- A downgrade of some tools is required to create APKs:
+  - Gradle 3.2                 (File → Project Structure → Project)
+  - Android plugin 2.2.2       (File → Project Structure → Project)
+  - Build Tools Version 23.0.3 (File → Project Structure → app under Modules)
+
+## Slackware64 tips.
+You will experience some problems installing the Android SDK (as it uses
+some 32-bit binaries) and running 32-bit AVDs.
diff --git a/development/android-studio/android-studio.SlackBuild b/development/android-studio/android-studio.SlackBuild
index 32631c9f2dd65..78fe2278d4f6e 100644
--- a/development/android-studio/android-studio.SlackBuild
+++ b/development/android-studio/android-studio.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for Android Studio
 
-# Copyright 2009-2016  Roberto Metere, Cagliari (CA), Italy <roberto@metere.it>
+# Copyright 2012-2017  Roberto Metere, Cagliari (CA), Italy <roberto@metere.it>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=android-studio
-VERSION=${VERSION:-2.2.2.0_145_3360264}
+VERSION=${VERSION:-2.3.0.8_162_3764568}
 SRCVER=$(echo ${VERSION#*_} | sed 's/_/./')
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -52,6 +52,7 @@ cd $PKG
 # Make and install launchers
 #
 mkdir -p $PKG/usr/share/applications
+install -D -m 644 $PKG/usr/share/android-studio/bin/studio.png $PKG/usr/share/pixmaps/android-studio.png
 install -D -m 644 $CWD/android-studio.desktop $PKG/usr/share/applications/android-studio.desktop
 mkdir -p $PKG/usr/bin
 (
diff --git a/development/android-studio/android-studio.desktop b/development/android-studio/android-studio.desktop
index ba0b8cbe3499c..730706d52dce4 100644
--- a/development/android-studio/android-studio.desktop
+++ b/development/android-studio/android-studio.desktop
@@ -2,8 +2,8 @@
 Name=Android Studio
 GenericName=Android IDE
 Comment=Android development environment based on IntelliJ IDEA
-Exec=/usr/share/android-studio/bin/studio.sh
-Icon=/usr/share/android-studio/bin/studio.png
+Exec=android-studio
+Icon=android-studio
 Path=/usr/share/android-studio/bin/
 Type=Application
 Categories=Development;
diff --git a/development/android-studio/android-studio.info b/development/android-studio/android-studio.info
index f67efa085b7be..791d67ef804f2 100644
--- a/development/android-studio/android-studio.info
+++ b/development/android-studio/android-studio.info
@@ -1,10 +1,10 @@
 PRGNAM="android-studio"
-VERSION="2.2.2.0_145_3360264"
-HOMEPAGE="http://developer.android.com/tools/studio/index.html"
-DOWNLOAD="https://dl.google.com/dl/android/studio/ide-zips/2.2.2.0/android-studio-ide-145.3360264-linux.zip"
-MD5SUM="2ee9429d73815c3420ed4256143eec09"
+VERSION="2.3.0.8_162_3764568"
+HOMEPAGE="https://developer.android.com/studio/index.html"
+DOWNLOAD="https://dl.google.com/dl/android/studio/ide-zips/2.3.0.8/android-studio-ide-162.3764568-linux.zip"
+MD5SUM="785e4e30d539a28eeb1a8889a1d8ad32"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES=""
 MAINTAINER="Roberto Metere"
 EMAIL="roberto@metere.it"
diff --git a/development/android-studio/slack-desc b/development/android-studio/slack-desc
index 03ae8ac2b2725..cee52231e1ce0 100644
--- a/development/android-studio/slack-desc
+++ b/development/android-studio/slack-desc
@@ -13,7 +13,7 @@ android-studio: IntelliJ IDEA. It provides new features and improvements over
 android-studio: Eclipse ADT and will be the official Android IDE once it's ready.
 android-studio:
 android-studio:
-android-studio: Homepage: https://developer.android.com/sdk/installing/studio.html
+android-studio: Homepage: https://developer.android.com/studio/
 android-studio:
 android-studio:
 android-studio: