Package updated.

1 files changed, 6 insertions, 21 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0b8425693d1c..22f568478a4a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,18 @@
-# PKGBUILD for android-lame
 # Maintainer: Gonzalo Exequiel Pedone <hipersayan DOT x AT gmail DOT com>
 
 _android_arch=aarch64
-source android-env.sh ${_android_arch}
+source android-env ${_android_arch}
 
 pkgname=android-${_android_arch}-xz
 pkgver=5.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Library and command line tools for XZ and LZMA compressed files (android)"
 arch=('any')
 url="https://tukaani.org/xz"
 license=('custom' 'GPL' 'LGPL')
 depends=('android-ndk')
 options=(!strip !buildflags staticlibs !emptydirs)
-makedepends=('android-pkg-config')
+makedepends=('android-configure')
 source=("${url}/xz-${pkgver}.tar.gz")
 sha256sums=('b512f3b726d3b37b6dc4c8570e137b9311e7552e8ccbab4d39d47ce5f4177145')
 
@@ -24,19 +23,7 @@ prepare() {
 build() {
     cd "${srcdir}"/xz-${pkgver}
 
-    export CC=${ANDROID_CC}
-    export CXX=${ANDROID_CXX}
-    target=${_android_arch/x86-/x86_}-linux-android
-
-    ./configure \
-        --host=${target} \
-        --target=${target} \
-        --build="$CHOST" \
-        --prefix=${ANDROID_LIBS} \
-        --libdir=${ANDROID_LIBS}/lib \
-        --includedir=${ANDROID_LIBS}/include \
-        --enable-shared \
-        --enable-static \
+    android-${_android_arch}-configure \
         --disable-xz \
         --disable-xzdec \
         --disable-lzmadec \
@@ -45,7 +32,6 @@ build() {
         --disable-scripts \
         --disable-doc
 
-
     make $MAKEFLAGS
 }
 
@@ -53,7 +39,6 @@ package() {
     cd "${srcdir}"/xz-${pkgver}
 
     make DESTDIR="$pkgdir" install
-#    rm -r "${pkgdir}"/${ANDROID_LIBS}/share
-    ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_LIBS}/lib/*.so
-    ${ANDROID_STRIP} -g "$pkgdir"/${ANDROID_LIBS}/lib/*.a
+    ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_PREFIX_LIB}/*.so
+    ${ANDROID_STRIP} -g "$pkgdir"/${ANDROID_PREFIX_LIB}/*.a
 }