Manual merge of version 29.0.6-18+rpi1 and 29.0.6-19 to produce 29.0.6-19+rpi1

diff --cc debian/changelog
index f8168a3b013a8011675ab28ba948c156cd683e2c,cf121c4dd3c9d05c4f9c0b095c294667f3d7e7fd..10a9f6b317f103c054a7cae0b91fb0a43d0ce751
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- android-platform-tools (29.0.6-18+rpi1) bookworm-staging; urgency=medium
++android-platform-tools (29.0.6-19+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 29.0.6-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 22 Mar 2022 22:50:07 +0000]
 +  * Build with clang-11 to avoid armv7 contamination.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 14 Jul 2022 14:12:26 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 22 Jul 2022 01:48:17 +0000
++
+ android-platform-tools (29.0.6-19) unstable; urgency=medium
+ 
+   * Team upload.
+   * Cherry-pick from debian/exp to restore supporting for mips*el.
+ 
+  -- Roger Shimizu <rosh@debian.org>  Tue, 28 Jun 2022 02:30:12 +0900
  
  android-platform-tools (29.0.6-18) unstable; urgency=medium
  

diff --cc debian/control
index 0bc37c8966bf54a8d2c626bf9340424518b931c7,f4f2cc9a7ec3237e113ba2cdf36db8a64fec4cae..bfe2cc503f97300a76dc33b6b39dd345975abb92
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -4,9 -4,9 +4,9 @@@ Priority: optiona
  Maintainer: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
  Uploaders: Chirayu Desai <chirayudesai1@gmail.com>
  Build-Depends:
-  android-libboringssl-dev [amd64 i386 armel armhf arm64],
+  android-libboringssl-dev [amd64 i386 armel armhf arm64 mipsel mips64el],
   bash-completion,
 - clang [amd64 i386 armel armhf arm64 mipsel mips64el ppc64el s390x powerpc ppc64 sparc64 riscv64],
 + clang-11 [amd64 i386 armel armhf arm64 mipsel mips64el ppc64el s390x powerpc ppc64 sparc64 riscv64],
   debhelper-compat (= 13),
   dh-exec,
   libgtest-dev,

diff --cc debian/rules
index e6404aa042fb622a3ae35edc2ca1c8f3fd3443e2,84761e70bb5bc07df63cdd863c8c6a3e9f240d01..a9a6da22d46172c1e503b97875578bf1f9f56a47
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -22,9 -27,16 +27,13 @@@ export DEB_VERSIO
  # https://android.googlesource.com/platform/development/+/refs/tags/platform-tools-29.0.6/sdk/plat_tools_source.prop_template
  export PLATFORM_TOOLS_VERSION = 29.0.6
  
 -ifneq (, $(shell which clang))
 -  export CC=clang
 -  export CXX=clang++
 +export CC=clang-11
 +export CXX=clang++-11
+   export DEB_CPPFLAGS_MAINT_APPEND += \
+     -Wno-c99-designator \
+     -Wno-gnu-designator \
+     -Wno-gnu-folding-constant \
  
 -endif
 -
  %:
        dh $@ --with bash-completion