From: Peter Michael Green Date: Sat, 23 Jan 2021 10:27:38 +0000 (+0000) Subject: Manual merge of version 8.1.0+r23-3+rpi2 and 10.0.0+r36-3 to produce 10.0.0+r36-3... X-Git-Tag: archive/raspbian/10.0.0+r36-3+rpi1~12 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=811937efccfc7260fac15c96c4ffbaabf7fabbd1;p=android-platform-art.git Manual merge of version 8.1.0+r23-3+rpi2 and 10.0.0+r36-3 to produce 10.0.0+r36-3+rpi1 --- 811937efccfc7260fac15c96c4ffbaabf7fabbd1 diff --cc debian/changelog index 36d8a6e,b03a9c3..9b46b12 --- a/debian/changelog +++ b/debian/changelog @@@ -1,21 -1,127 +1,139 @@@ - android-platform-art (8.1.0+r23-3+rpi2) buster-staging; urgency=medium ++android-platform-art (10.0.0+r36-3+rpi1) bullseye-staging; urgency=medium + - * Revert changes from 8.1.0+r23-3+rpi1 ++ [changes brought forward from 8.1.0+r23-3+rpi2 by Peter Michael Green at Tue, 19 Mar 2019 01:46:21 +0000] + * Replace ubfx and sbfx with shift instructions + * Replace movw with mov and orr + * Failed attempt to avoid tagging asm files as armv7 + (I'm just going to let this one through despite the apparent + armv7 content, i suspect that is a lesser evil than not having + the package at all). + - -- Peter Michael Green Tue, 19 Mar 2019 01:46:21 +0000 ++ -- Raspbian forward porter Sat, 23 Jan 2021 10:18:40 +0000 + - android-platform-art (8.1.0+r23-3+rpi1) buster-staging; urgency=medium + android-platform-art (10.0.0+r36-3) unstable; urgency=medium - * Don't build andriod libs (but do build dmtracedump) on armhf for raspbian, - they apparently contain assembler that is not armv6 compatible. + * Team upload. - -- Peter Michael Green Tue, 19 Mar 2019 01:31:47 +0000 + [ Roger Shimizu ] + * debian/*.mk: + - Remove runtime library path: debian/out, which is only needed + after building. + - Remove LDFLAGS=-nodefaultlibs for library. + * debian/rules: + - Add LD_LIBRARY_PATH=debian/out for help2man calling. + + [ Hans-Christoph Steiner ] + * mv man page gen to dh_auto_build and respect arches + + -- Hans-Christoph Steiner Thu, 07 Jan 2021 13:08:42 +0100 + + android-platform-art (10.0.0+r36-2) unstable; urgency=medium + + * Team upload. + * debian/*.mk: + - Add necessary linking libraries to fix ftbfs issue. + + -- Roger Shimizu Wed, 06 Jan 2021 19:29:23 +0900 + + android-platform-art (10.0.0+r36-1) unstable; urgency=medium + + * Team upload. + * Revert "remove stage1 components" + * debian/tests: + - Add "Depends" to each test command. + * debian/control: + - Remove building package dexlist/dexdump for armel. + - Fix package description. + * debian/*.mk: + - Remove unnecessary linking dependencies. + - Add "-nodefaultlibs" to LDFLAGS. + * lintian-overrides: + - Rename binary-or-shlib-defines-rpath to custom-library-search-path + + -- Roger Shimizu Wed, 06 Jan 2021 00:31:36 +0900 + + android-platform-art (10.0.0+r36-1~stage1.5) unstable; urgency=medium + + * Team upload. + * debian/patches: + - Backport patch from upstream to fix mterp asm build on arm64. + (Closes: #963058) + + -- Roger Shimizu Mon, 04 Jan 2021 16:03:34 +0900 + + android-platform-art (10.0.0+r36-1~stage1.4) unstable; urgency=medium + + * Team upload. + * debian/*.mk: + - "mkdir debian/out" command move to debian/rules. + * debian/patches: + - Add patches to fix ftbfs on armhf/arm64. + + -- Roger Shimizu Mon, 04 Jan 2021 01:24:17 +0900 + + android-platform-art (10.0.0+r36-1~stage1.3) unstable; urgency=medium + + * debian/control: + - Bump B-D android-platform-system-core. + * debian/patches: + - Add patch to workaround cacheflush on arm. + * debian/control: + - Remove valgrind from B-D. + * debian/*.mk: + - Remove duplicated "-fPIC" and "-I/usr/include/android" + + -- Roger Shimizu Sat, 02 Jan 2021 01:30:12 +0900 + + android-platform-art (10.0.0+r36-1~stage1.2) unstable; urgency=low + + * Team upload. + * d/rules: Exclude building libdexfile_support.so from "any" + architecture. + + -- Roger Shimizu Fri, 01 Jan 2021 01:21:41 +0900 + + android-platform-art (10.0.0+r36-1~stage1.1) unstable; urgency=low + + * Team upload. + + [ Hans-Christoph Steiner ] + * add missing art_api headers and .cc files + * build libdexfile_external and libdexfile_support separately + + [ Roger Shimizu ] + * Fix ftbfs issues on mips* + * Use patch from android-platform-system-core to fix non-x86 systems + + -- Hans-Christoph Steiner Wed, 30 Dec 2020 23:15:12 +0100 + + android-platform-art (10.0.0+r36-1~stage1) unstable; urgency=low + + * Team upload. + + [ Debian Janitor ] + * Use correct machine-readable copyright file URI. + * Bump debhelper from old 11 to 12. + * Set debhelper-compat version in Build-Depends. + + [ Hans-Christoph Steiner ] + * New upstream release (Closes: #963058) + + -- Hans-Christoph Steiner Tue, 13 Oct 2020 17:10:14 +0200 + + android-platform-art (8.1.0+r23-4) unstable; urgency=medium + + * Team upload. + * debian/watch: + - Remove the unsupported "rename" option. + - Update rule to get new upstream version. + * debian/control: + - Add Rules-Requires-Root: no + - Add help2man to B-D. + * debian/rules: + - Add more security hardening. + - Use help2man to generate manpages for dexdump, and dmtracedump. + + -- Roger Shimizu Sun, 10 May 2020 18:42:38 +0900 android-platform-art (8.1.0+r23-3) unstable; urgency=medium diff --cc debian/patches/series index 593fa08,c8b3dba..86eeb04 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,10 -1,14 +1,17 @@@ use-android-dlmalloc.patch missing-system-includes.patch ucontext.patch - PAGE_SIZE.patch atomic-exception-specification.patch - StrideIterator-constructor.patch + image-space-dereference.patch + storage-mode-concat.patch + method-reference-std-ns.patch + python3-gen_mterp.patch + stats-incomplete-def.patch + fix-build-on-non-x86.patch + workaround-cacheflush-on-arm.patch + adapt-asm-output-of-clang-that-no-is-placed-before-data.patch + arm-asm-instruction.patch + fix-mterp-assembly-to-use-uxtw-instead-of-lsl-where-needed.patch +hack-out-ubfx-and-sbfx.patch +replace-movw.patch +#dont-tag-asm-as-armv7.patch