[arch-commits] Commit in android-tools/trunk (PKGBUILD)

[Eli Schwartz]

    Date: Sunday, January 24, 2021 @ 15:08:58
  Author: eschwartz
Revision: 828801

android-tools: latest version of avbtool uses python3

See:
https://android.googlesource.com/platform/external/avb/+/13efb5f99e9a022a92a3dba12c7fa72b05d1d9e1

The sed no longer applies in the currently packaged version (drop it), and the
optdepends is no longer accurate (move it).

Modified:
  android-tools/trunk/PKGBUILD

----------+
 PKGBUILD |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-24 14:34:03 UTC (rev 828800)
+++ PKGBUILD	2021-01-24 15:08:58 UTC (rev 828801)
@@ -11,8 +11,8 @@
 url='http://tools.android.com/'
 license=(Apache MIT)
 depends=(pcre2 libusb protobuf brotli)
-optdepends=('python: for mkbootimg script'
-            'python2: for unpack_bootimg & avbtool scripts')
+optdepends=('python: for mkbootimg & avbtool scripts'
+            'python2: for unpack_bootimg script')
 # it depends on 'vim' because of 'xxd' tool.
 makedepends=(git clang gtest cmake ninja go vim)
 provides=(fastboot adb)
@@ -36,7 +36,7 @@
 # To avoid the complexity we prebuilt the lib from the Android sources directly
 # using following instructions:
 #   (See https://wiki.archlinux.org/index.php/Android for context)
-# 
+#
 #   source build/envsetup.sh
 #   lunch full-eng
 #   mmm system/core/adb/
@@ -74,9 +74,6 @@
   cd "$srcdir"/libziparchive
   patch -p1 < ../fix_libziparchive.patch
 
-  cd "$srcdir"/avb
-  sed -i 's|/usr/bin/env python$|/usr/bin/env python2|g' avbtool
-
   cd "$srcdir"/mkbootimg
   sed -i 's|/usr/bin/env python$|/usr/bin/env python2|g' unpack_bootimg.py