summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Hai2018-07-12 17:15:13 +0800
committerZhang Hai2018-07-12 17:15:13 +0800
commit8280ba6077180ecfde185b40b1972c3c5475bcec (patch)
tree157436fe15a6c50bd61446f092c7bd71529f3e69
parente046d9382478296fd4cf873bf3f12308dbae1267 (diff)
downloadaur-8280ba6077180ecfde185b40b1972c3c5475bcec.tar.gz
Remove i686 support as upstream dropped it.
-rw-r--r--.SRCINFO30
-rw-r--r--PKGBUILD15
2 files changed, 13 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index aaf47f0a12e1..36a17ec529b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,39 +1,27 @@
# Generated by mksrcinfo v8
-# Tue Jul 10 01:11:10 UTC 2018
+# Thu Jul 12 09:11:38 UTC 2018
pkgbase = android-emulator
pkgdesc = Google Android Emulator
pkgver = 27.3.8
pkgrel = 1
url = https://developer.android.com/studio/releases/emulator.html
install = android-emulator.install
- arch = i686
arch = x86_64
license = custom
+ depends = libpulse
+ depends = libx11
+ depends = libxcb
+ depends = libxdamage
+ depends = libxext
+ depends = libxfixes
+ depends = ncurses5-compat-libs
+ depends = zlib
source = https://dl.google.com/android/repository/emulator-linux-4848055.zip
source = android-emulator.sh
source = android-emulator.csh
sha1sums = 75e45d9daea187b0449b74fccd6a06b701f672c6
sha1sums = 4537a7ce30bedf87cedafc2020822219ad58310d
sha1sums = 2fb371b5774b67143f0610dfbec4963a4e2f11cc
- depends_i686 = gcc-libs
- depends_i686 = libpulse
- depends_i686 = libx11
- depends_i686 = libxcb
- depends_i686 = libxdamage
- depends_i686 = libxext
- depends_i686 = libxfixes
- depends_i686 = ncurses5-compat-libs
- depends_i686 = zlib
- depends_x86_64 = lib32-gcc-libs
- depends_x86_64 = lib32-glibc
- depends_x86_64 = libpulse
- depends_x86_64 = libx11
- depends_x86_64 = libxcb
- depends_x86_64 = libxdamage
- depends_x86_64 = libxext
- depends_x86_64 = libxfixes
- depends_x86_64 = ncurses5-compat-libs
- depends_x86_64 = zlib
pkgname = android-emulator
diff --git a/PKGBUILD b/PKGBUILD
index ddacb2a012fb..7ba1b0a01ee0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,11 @@ pkgname=android-emulator
pkgver=27.3.8
pkgrel=1
pkgdesc='Google Android Emulator'
-arch=('i686' 'x86_64')
+arch=('x86_64')
url='https://developer.android.com/studio/releases/emulator.html'
license=('custom')
-depends_i686=('gcc-libs' 'libpulse' 'libx11' 'libxcb' 'libxdamage'
- 'libxext' 'libxfixes' 'ncurses5-compat-libs' 'zlib')
-depends_x86_64=('lib32-gcc-libs' 'lib32-glibc' 'libpulse' 'libx11'
- 'libxcb' 'libxdamage' 'libxext' 'libxfixes'
- 'ncurses5-compat-libs' 'zlib')
+depends=('libpulse' 'libx11' 'libxcb' 'libxdamage' 'libxext'
+ 'libxfixes' 'ncurses5-compat-libs' 'zlib')
install="${pkgname}.install"
source=('https://dl.google.com/android/repository/emulator-linux-4848055.zip'
"${pkgname}.sh"
@@ -25,11 +22,7 @@ package() {
install -Dm755 "${pkgname}.sh" "${pkgdir}/etc/profile.d/${pkgname}.sh"
install -Dm755 "${pkgname}.csh" "${pkgdir}/etc/profile.d/${pkgname}.csh"
- rm -rf emulator/lib{,64}/libstdc++
-
- if [[ "${CARCH}" = i686 ]]; then
- rm -rf emulator/lib64/
- fi
+ rm -rf emulator/lib64/libstdc++
install -d "${pkgdir}/opt/android-sdk/"
cp -a emulator "${pkgdir}/opt/android-sdk/"