summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorabhishek96502018-08-27 19:49:13 +0530
committerabhishek96502018-08-27 19:49:13 +0530
commitd83746f90d9909d20d70ba780d7d2e3f7774bd58 (patch)
treeb35fb8229f2e9b7ec90309a11235676d01b4731a
parent9bba14f0513133870c45043204fcec3860d36fbd (diff)
downloadaur-d83746f90d9909d20d70ba780d7d2e3f7774bd58.tar.gz
Fxing the conflicts caused by android-tools package
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD6
2 files changed, 7 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a3df74d2afeb..2be461639e7c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,22 @@
pkgbase = halium-devel
pkgdesc = Metapackage to pull all dependencies required to build Halium
pkgver = 0.1
- pkgrel = 1
- url = https://wiki.archlinux.org/index.php/Android#Building_Android
+ pkgrel = 2
+ url = halium.org
arch = x86_64
license = None
depends = ffmpeg
depends = ninja
depends = lzop
depends = pngcrush
- depends = pngcrush
depends = aosp-devel
depends = imagemagick
depends = simg-tools
- depends = android-sdk-platform-tools
- depends = bootimg-tools-git
+ depends = android-tools
depends = abootimg-git
depends = qemu
depends = qemu-user-static
+ depends = binfmt-qemu-static
pkgname = halium-devel
diff --git a/PKGBUILD b/PKGBUILD
index aa150651d977..9f7958e6faa4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
# Maintainer: Abhishek Mudgal (abhishek9650)
pkgname=halium-devel
pkgver=0.1
-pkgrel=1
+pkgrel=2
pkgdesc='Metapackage to pull all dependencies required to build Halium'
arch=('x86_64')
-url='https://wiki.archlinux.org/index.php/Android#Building_Android'
+url='halium.org'
license=('None')
-depends=('ffmpeg' 'ninja' 'lzop' 'pngcrush' 'pngcrush' 'aosp-devel' 'imagemagick' 'simg-tools' 'android-sdk-platform-tools' 'bootimg-tools-git' 'abootimg-git' 'qemu' 'qemu-user-static')
+depends=('ffmpeg' 'ninja' 'lzop' 'pngcrush' 'aosp-devel' 'imagemagick' 'simg-tools' 'android-tools' 'abootimg-git' 'qemu' 'qemu-user-static' 'binfmt-qemu-static')