From: Peter Michael Green Date: Fri, 22 Jul 2022 01:48:45 +0000 (+0000) Subject: Manual merge of version 29.0.6-18+rpi1 and 29.0.6-19 to produce 29.0.6-19+rpi1 X-Git-Tag: archive/raspbian/29.0.6-19+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a1d67fc4214a453364ccc53207a3827f7e039761;p=android-platform-tools.git Manual merge of version 29.0.6-18+rpi1 and 29.0.6-19 to produce 29.0.6-19+rpi1 --- a1d67fc4214a453364ccc53207a3827f7e039761 diff --cc debian/changelog index f8168a3b,cf121c4d..10a9f6b3 --- a/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 at Tue, 22 Mar 2022 22:50:07 +0000] + * Build with clang-11 to avoid armv7 contamination. + - -- Peter Michael Green Thu, 14 Jul 2022 14:12:26 +0000 ++ -- Peter Michael Green 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 Tue, 28 Jun 2022 02:30:12 +0900 android-platform-tools (29.0.6-18) unstable; urgency=medium diff --cc debian/control index 0bc37c89,f4f2cc9a..bfe2cc50 --- a/debian/control +++ b/debian/control @@@ -4,9 -4,9 +4,9 @@@ Priority: optiona Maintainer: Android Tools Maintainers Uploaders: Chirayu Desai 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 e6404aa0,84761e70..a9a6da22 --- a/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