diff -Nru android-platform-tools-29.0.6/debian/changelog android-platform-tools-29.0.6/debian/changelog --- android-platform-tools-29.0.6/debian/changelog 2022-08-02 15:23:27.000000000 +0000 +++ android-platform-tools-29.0.6/debian/changelog 2022-08-07 10:22:25.000000000 +0000 @@ -1,3 +1,10 @@ +android-platform-tools (29.0.6-21+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 29.0.6-6+rpi1 by Peter Michael Green at Tue, 22 Mar 2022 22:50:07 +0000] + * Build with clang-11 to avoid armv7 contamination. + + -- Raspbian forward porter Sun, 07 Aug 2022 10:22:25 +0000 + android-platform-tools (29.0.6-21) unstable; urgency=medium * Team upload. diff -Nru android-platform-tools-29.0.6/debian/control android-platform-tools-29.0.6/debian/control --- android-platform-tools-29.0.6/debian/control 2022-08-02 15:23:27.000000000 +0000 +++ android-platform-tools-29.0.6/debian/control 2022-08-07 10:22:25.000000000 +0000 @@ -5,7 +5,7 @@ Uploaders: Chirayu Desai Build-Depends: 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, Build-Depends-Arch: diff -Nru android-platform-tools-29.0.6/debian/rules android-platform-tools-29.0.6/debian/rules --- android-platform-tools-29.0.6/debian/rules 2022-08-02 15:23:27.000000000 +0000 +++ android-platform-tools-29.0.6/debian/rules 2022-08-07 10:22:25.000000000 +0000 @@ -27,16 +27,13 @@ # 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