summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLalit Maganti2016-08-06 07:16:19 +0100
committerLalit Maganti2016-08-06 07:16:19 +0100
commit45d258cefb55798bb82ffa51390da6d6a014bd6a (patch)
tree8cfb858247180d10b4d495e263e720c294c4ee75
parentc7056243cab4b9eef02dbb453f6ecb841ef483df (diff)
parentb86d38223c134619dca580339a2cbeb4546d56ec (diff)
downloadaur-45d258cefb55798bb82ffa51390da6d6a014bd6a.tar.gz
Merge branch 'master' of ssh+git://aur4.archlinux.org/android-studio-canary
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD3
2 files changed, 2 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 487cd78caa19..c10640fba664 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Sat Aug 6 06:14:52 UTC 2016
+# Sat Aug 6 06:16:04 UTC 2016
pkgbase = android-studio-canary
pkgdesc = The Official Android IDE. Canary branch
pkgver = 2.2.0a7
@@ -16,10 +16,6 @@ pkgbase = android-studio-canary
depends = fontconfig
depends = libxrender
depends = mesa
- optdepends = android-sdk
- optdepends = android-sdk-platform-tools
- optdepends = android-sdk-build-tools
- provides = android-studio=2.2.0a7
conflicts = android-studio
conflicts = android-studio-beta
conflicts = android-studio-dev
diff --git a/PKGBUILD b/PKGBUILD
index 8daf8dd3b3bb..f38a62bc7a4d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,8 +17,7 @@ url="http://developer.android.com/sdk/installing/studio.html"
license=('APACHE')
depends=('java-environment' 'python' 'gtk2')
makedepends=('unzip')
-optdepends=('android-sdk' 'android-sdk-platform-tools' 'android-sdk-build-tools')
-provides=("android-studio=$pkgver")
+oidprovides=("android-studio=$pkgver")
conflicts=('android-studio' 'android-studio-beta' 'android-studio-dev')
options=('!strip')
install=$pkgname.install