Update to version 34.0.0(-rc2)

2 files changed, 13 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ff9e23cf6d76..b2a9b9114b44 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,16 @@
 
 pkgname=android-sdk-build-tools
 #_ver=$(cat "${srcdir}/$_android/source.properties" |grep ^Pkg.Revision=|sed 's/Pkg.Revision=\([0-9.]*\).*/\1/')
-_major=33
+_major=34
 _minor=0
-_micro=2
-_ver=$_major.$_minor.$_micro
-pkgver=r$_ver
+_micro=0
+_ver=34.0.0-rc2
+_displayversion=34-rc2
+pkgver=r34.0.0
 pkgrel=1
+_sdk=android-sdk
+_android=android-UpsideDownCake
+
 pkgdesc='Build-Tools for Google Android SDK (aapt, aidl, dexdump, dx, llvm-rs-cc)'
 arch=('x86_64')
 url="https://developer.android.com/studio/releases/build-tools"
@@ -16,21 +20,18 @@ license=('custom')
 depends=('gcc-libs' 'zlib')
 optdepends=('lib32-gcc-libs' 'lib32-zlib')
 
-source=("https://dl-ssl.google.com/android/repository/build-tools_${pkgver}-linux.zip"
+source=("https://dl-ssl.google.com/android/repository/build-tools_r${_displayversion}-linux.zip"
         "package.xml")
-sha512sums=('a4bee308b31ffaf08437f4ab2d0e9e84242946f440f33096b9eecbd7a28adc29bfcdd5e028a3a4696be82923e38f6bf9285b880100177110255d70b170853b14'
-            '3bbb3283d80e42a21e05cd44d0a46a95c6a832c31993cb896a2620f6c39ebd33b0c1ec668e4b79e3f28d25e55e99f6940eff6b85e937e930b6d1326be4ae9e36')
+sha512sums=('1b52510ad3f7724728979a794560410cab2850b0f22efc8c824458af871ccc6e6532592bf72117d50f28b6d8c741a4b846df9c68aa18b82721112958a4040073'
+            '501211771b02940010420a4003b8396d3d6599fb339c2f64959335ab1c3cf615811cc62acaa093c9f4e14bbc019a9e493835573a5136383617d8b5184509d3f8')
 options=('!strip')
 
-_sdk=android-sdk
-_android=android-13
-
 package() {
   cd "$pkgdir"
 
   install -d usr/share/licenses/$pkgname/
   ln -s /opt/$_sdk/build-tools/$_ver/NOTICE.txt usr/share/licenses/$pkgname/NOTICE.txt
-  sed -i "s/@major@/$_major/g;s/@minor@/$_minor/g;s/@micro@/$_micro/g" "$srcdir/package.xml"
+  sed -i "s/@major@/$_major/g;s/@minor@/$_minor/g;s/@micro@/$_micro/g;s/@displayv@/$_displayversion/g;s/@pathv@/$_ver/g" "$srcdir/package.xml"
   install -Dm644 "${srcdir}/package.xml" opt/$_sdk/build-tools/$_ver/package.xml
   ln -s /opt/$_sdk/build-tools/$_ver/package.xml usr/share/licenses/$pkgname/package.xml
 
diff --git a/package.xml b/package.xml
index 6b38efb37b44..45104af3860a 100644
--- a/package.xml
+++ b/package.xml
@@ -138,4 +138,4 @@ This is the Android Software Development Kit License Agreement
 14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
 
 
-January 16, 2019</license><localPackage path="build-tools;@major@.@minor@.@micro@" obsolete="false"><type-details xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns5:genericDetailsType"/><revision><major>@major@</major><minor>@minor@</minor><micro>@micro@</micro></revision><display-name>Android SDK Build-Tools @major@.@minor@.@micro@</display-name><uses-license ref="android-sdk-license"/></localPackage></ns2:repository>
+January 16, 2019</license><localPackage path="build-tools;@pathv@" obsolete="false"><type-details xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns5:genericDetailsType"/><revision><major>@major@</major><minor>@minor@</minor><micro>@micro@</micro></revision><display-name>Android SDK Build-Tools @displayv@</display-name><uses-license ref="android-sdk-license"/></localPackage></ns2:repository>