Package updated.

1 files changed, 7 insertions, 21 deletions

diff --git a/PKGBUILD b/PKGBUILD
index babfefd0be3a..8273cdbdac99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,18 @@
-# PKGBUILD for android-libogg
 # 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}-libogg
 pkgver=1.3.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Ogg bitstream and framing library (android)"
 arch=('any')
 url="http://xiph.org"
 license=('BSD')
 depends=('android-ndk')
 options=(!strip !buildflags staticlibs !emptydirs)
-makedepends=('android-pkg-config')
+makedepends=('android-configure')
 source=("http://downloads.xiph.org/releases/ogg/libogg-${pkgver}.tar.gz")
 sha256sums=('c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985')
 
@@ -24,20 +23,7 @@ prepare() {
 build() {
     cd "${srcdir}"/libogg-${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
     make $MAKEFLAGS
 }
 
@@ -45,7 +31,7 @@ package() {
     cd "${srcdir}"/libogg-${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
+    rm -r "${pkgdir}"/${ANDROID_PREFIX_SHARE}
+    ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_PREFIX_LIB}/*.so
+    ${ANDROID_STRIP} -g "$pkgdir"/${ANDROID_PREFIX_LIB}/*.a
 }