Merge version 29.0.6-23+rpi1 and 29.0.6-25 to produce 29.0.6-25+rpi1

Merge android-platform-tools (29.0.6-25) import into refs/heads/workingbranch

Reject external connect: requests.

Steps:
  1. Track forward:reverse config in a data-structure.
  2. connect_to_remote() examines each socket transport and updates
    this data-structure.
  3. handle_packet() takes appropriate action
    (abort) for an unknown connect: request originating from the device.

Bug:205286508

Test: treehugger

Signed-off-by: jmgao <jmgao@fb.com>
Change-Id: I0ec7d6f8e60afc2ee5d1be2b63bf90ca99443a52

Gbp-Pq: Topic cve
Gbp-Pq: Name CVE-2022-3168.patch

Backport of Win-specific suppression of potentially rogue construct that can engage in directory traversal on the host.

Bug:209438553

Ignore-AOSP-First: Resolution for potential security exploit.

Test: Relying on presubmits for now.
Will followup with a full-fledged sync and manual cursory test.

Merged-In: Ie1f82db2fb14e1bdd183bf8d3d93d5e9f974be5d
Change-Id: I2a5da348eba104a7d06d6c0acb3cd56b770142a1

Gbp-Pq: Topic cve
Gbp-Pq: Name CVE-2022-20128.patch

Switch to an assembler macro for CFI_RESTORE_STATE_AND_DEF_CFA

Newer versions of clang reject multiple assembler directives
on the same line, which breaks the preprocessor macro
CFI_RESTORE_STATE_AND_DEF_CFA. Fix it by making it an assembler
macro instead.

Bug: 191980979
Change-Id: I823ff9c66336931249d2bac40280b24ecdebd0cf
(cherry picked from commit 082659bcbf66c08e2ad9be88363c7ab88c50e114)

Gbp-Pq: Topic art
Gbp-Pq: Name add-assembler-macro.patch

Add missing 'std::' scope identifiers.

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name fix-standard-namespace-errors.patch

arm asm instruction

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name arm-asm-instruction.patch

Workaround cacheflush on arm

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name workaround-cacheflush-on-arm.patch

non-x86 arches do not have PAGE_SIZE

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name fix-build-on-non-x86.patch

Use `Stats*` instead of `Stats`

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name stats-incomplete-def.patch

Fix python interpreter name

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name python3-gen_mterp.patch

Add standard namespace scope resolution

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name method-reference-std-ns.patch

Fix concatenation of storage_mode string.

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name storage-mode-concat.patch

get libart building

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name image-space-dereference.patch

Conforms with the exception specification of `std::atomic`

Forwarded: not-needed

All constructors of `std::atomic` require `noexcept`. As a result, its members
must also be able to instantiate without any exception throwing.

Gbp-Pq: Topic art
Gbp-Pq: Name atomic-exception-specification.patch

Use `ucontext_t` instead of `ucontext`

Forwarded: not-needed

Both Bionic and glibc define a struct called `ucontext_t` but only Bionic
defines an alias `ucontext_t`. Let's use the more standardized one.

Gbp-Pq: Topic art
Gbp-Pq: Name ucontext.patch

somehow upstream builds don't need these headers :-/

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name missing-system-includes.patch

Make libart use dlmalloc from

https://android.googlesource.com/platform/external/dlmalloc
Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name use-android-dlmalloc.patch

Fix typos

Last-Update: 2016-10-01
Forwarded: not-needed

Gbp-Pq: Topic development
Gbp-Pq: Name typos.patch

unwindstack porting

Forwarded: not-needed

Gbp-Pq: Topic system
Gbp-Pq: Name unwindstack-porting.patch

Fix include path

Gbp-Pq: Topic system
Gbp-Pq: Name Fix-include-path.patch

Fix shebang of python script

Forwarded: not-needed

Gbp-Pq: Topic system
Gbp-Pq: Name Fix-shebang-of-python-script.patch

Add riscv64 support

This patch contains the dwarf unwind support for 64bit risc-v.

    * DwarfCfa.cpp (cfa_def_cfa_register): setup register if CFA_REG is
    not setup for riscv64
    * Elf.cpp (GetRelPc): convert offset to virtual address for riscv64.
    * ElfInterface.cpp (GetVirtAddrFromOffset): New for riscv64.
    * RegsRiscv64.cpp (StepIfSignalHandler): Fix signal frame check.
    libunwindstack/include/unwindstack/
    * ElfInterface.h (GetVirtAddrFromOffset): New for riscv64.
    libunwindstack/tests/
    * DwarfCfaTest.cpp (cfa_def_cfa_register): ok for riscv64.
    * RegsStepIfSignalHandlerTest.cpp (riscv64_step_if_signal_handler): Fix
    testcase for riscv64

Test: Builds.
Test: All unit tests pass.

Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
Signed-off-by: Lifang Xia <lifang_xia@linux.alibaba.com>
Signed-off-by: Mao Han <han_mao@linux.alibaba.com>
Change-Id: Ib21ddf23cc83f332af202df7bffcaceec16063e0

Gbp-Pq: Topic system/core
Gbp-Pq: Name Add-riscv64-support.patch

Add missing 'std::' scope identifiers.

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name fix-standard-namespace-errors.patch

Defer packaging fastdeploy with adb for 29.x.x tags.

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name stub-out-fastdeploy.patch

just hard code rather than deal with circular deps

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name hard-code-build-number.patch

add-missing-headers

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name add-missing-headers.patch

non-x86 arches do not have PAGE_SIZE

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name fix-build-on-non-x86.patch

get libcutils building

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name fix-gettid-exception-declaration.patch

remove clang-ism

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name fix-attribute-issue-with-gcc.patch

Port simg_dump to Python 3.

Forwarded: not-needed
Last-Update: 2019-01-05
Origin: https://bugs.debian.org/945646

Gbp-Pq: Topic system/core
Gbp-Pq: Name simg_dump-python3.patch

Turn #error into exceptions

Forwarded: not-needed

So the library can be built on non-Linux platforms too, although can't
guarauntee its functionality regarding that piece of code.

Gbp-Pq: Topic system/core
Gbp-Pq: Name throw-exception-on-unknown-os.patch

Fix the weird error by GCC7 that fails to match the correct parent method.

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name Vector-cast.patch

Bring Clang's _Nonnull keyword to GCC

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name Nonnull.patch

Fix incompatibility between <stdatomic.h> and <atomic>

Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60932
Bug: https://reviews.llvm.org/D45470

This 2 headers combined will cause errors for both GCC and Clang. This patch
makes sure only one of them is present at any time.

Gbp-Pq: Topic system/core
Gbp-Pq: Name stdatomic.patch

libusb.h comes from different location

Forwarded: not-needed
Last-Update: 2018-05-26

Gbp-Pq: Topic system/core
Gbp-Pq: Name libusb-header-path.patch

Added missing headers causing compile errors

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name Added-missing-headers.patch

Update log file directory.

Last Updated: 2018-05-17

Last Updated: 2018-05-17

Gbp-Pq: Topic system/core
Gbp-Pq: Name move-log-file-to-proper-dir.patch

Added missing headers causing compile errors

Forwarded: not-needed

Gbp-Pq: Topic libnativehelper
Gbp-Pq: Name add-missing-headers.patch

android-platform-tools (29.0.6-25) unstable; urgency=medium

  * Team upload.
  * debian/control: Fix lld on B-D.
  * debian/control: Separate pandoc and ronn on B-D.
  * debian/control: Fix ftbfs on powerpc due to clang.
  * debian/libbacktrace.mk: Add RegsRiscv64.cpp into build.
  * debian/lintian-overrides: Add
    package-has-unnecessary-activation-of-ldconfig-trigger.

[dgit import unpatched android-platform-tools 29.0.6-25]

Import android-platform-tools_29.0.6-25.debian.tar.xz

[dgit import tarball android-platform-tools 29.0.6-25 android-platform-tools_29.0.6-25.debian.tar.xz]

Merge version 29.0.6-22+rpi1 and 29.0.6-23 to produce 29.0.6-23+rpi1

Merge android-platform-tools (29.0.6-23) import into refs/heads/workingbranch

Reject external connect: requests.

Steps:
  1. Track forward:reverse config in a data-structure.
  2. connect_to_remote() examines each socket transport and updates
    this data-structure.
  3. handle_packet() takes appropriate action
    (abort) for an unknown connect: request originating from the device.

Bug:205286508

Test: treehugger

Signed-off-by: jmgao <jmgao@fb.com>
Change-Id: I0ec7d6f8e60afc2ee5d1be2b63bf90ca99443a52

Gbp-Pq: Topic cve
Gbp-Pq: Name CVE-2022-3168.patch

Backport of Win-specific suppression of potentially rogue construct that can engage in directory traversal on the host.

Bug:209438553

Ignore-AOSP-First: Resolution for potential security exploit.

Test: Relying on presubmits for now.
Will followup with a full-fledged sync and manual cursory test.

Merged-In: Ie1f82db2fb14e1bdd183bf8d3d93d5e9f974be5d
Change-Id: I2a5da348eba104a7d06d6c0acb3cd56b770142a1

Gbp-Pq: Topic cve
Gbp-Pq: Name CVE-2022-20128.patch

Switch to an assembler macro for CFI_RESTORE_STATE_AND_DEF_CFA

Newer versions of clang reject multiple assembler directives
on the same line, which breaks the preprocessor macro
CFI_RESTORE_STATE_AND_DEF_CFA. Fix it by making it an assembler
macro instead.

Bug: 191980979
Change-Id: I823ff9c66336931249d2bac40280b24ecdebd0cf
(cherry picked from commit 082659bcbf66c08e2ad9be88363c7ab88c50e114)

Gbp-Pq: Topic art
Gbp-Pq: Name add-assembler-macro.patch

Add missing 'std::' scope identifiers.

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name fix-standard-namespace-errors.patch

arm asm instruction

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name arm-asm-instruction.patch

Workaround cacheflush on arm

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name workaround-cacheflush-on-arm.patch

non-x86 arches do not have PAGE_SIZE

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name fix-build-on-non-x86.patch

Use `Stats*` instead of `Stats`

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name stats-incomplete-def.patch

Fix python interpreter name

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name python3-gen_mterp.patch

Add standard namespace scope resolution

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name method-reference-std-ns.patch

Fix concatenation of storage_mode string.

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name storage-mode-concat.patch

get libart building

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name image-space-dereference.patch

Conforms with the exception specification of `std::atomic`

Forwarded: not-needed

All constructors of `std::atomic` require `noexcept`. As a result, its members
must also be able to instantiate without any exception throwing.

Gbp-Pq: Topic art
Gbp-Pq: Name atomic-exception-specification.patch

Use `ucontext_t` instead of `ucontext`

Forwarded: not-needed

Both Bionic and glibc define a struct called `ucontext_t` but only Bionic
defines an alias `ucontext_t`. Let's use the more standardized one.

Gbp-Pq: Topic art
Gbp-Pq: Name ucontext.patch

somehow upstream builds don't need these headers :-/

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name missing-system-includes.patch

Make libart use dlmalloc from

https://android.googlesource.com/platform/external/dlmalloc
Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name use-android-dlmalloc.patch

Fix typos

Last-Update: 2016-10-01
Forwarded: not-needed

Gbp-Pq: Topic development
Gbp-Pq: Name typos.patch

unwindstack porting

Forwarded: not-needed

Gbp-Pq: Topic system
Gbp-Pq: Name unwindstack-porting.patch

Fix include path

Gbp-Pq: Topic system
Gbp-Pq: Name Fix-include-path.patch

Fix shebang of python script

Forwarded: not-needed

Gbp-Pq: Topic system
Gbp-Pq: Name Fix-shebang-of-python-script.patch

Add missing 'std::' scope identifiers.

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name fix-standard-namespace-errors.patch

Defer packaging fastdeploy with adb for 29.x.x tags.

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name stub-out-fastdeploy.patch

just hard code rather than deal with circular deps

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name hard-code-build-number.patch

add-missing-headers

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name add-missing-headers.patch

non-x86 arches do not have PAGE_SIZE

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name fix-build-on-non-x86.patch

get libcutils building

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name fix-gettid-exception-declaration.patch

remove clang-ism

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name fix-attribute-issue-with-gcc.patch

Port simg_dump to Python 3.

Forwarded: not-needed
Last-Update: 2019-01-05
Origin: https://bugs.debian.org/945646

Gbp-Pq: Topic system/core
Gbp-Pq: Name simg_dump-python3.patch

Turn #error into exceptions

Forwarded: not-needed

So the library can be built on non-Linux platforms too, although can't
guarauntee its functionality regarding that piece of code.

Gbp-Pq: Topic system/core
Gbp-Pq: Name throw-exception-on-unknown-os.patch

Fix the weird error by GCC7 that fails to match the correct parent method.

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name Vector-cast.patch

Bring Clang's _Nonnull keyword to GCC

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name Nonnull.patch

Fix incompatibility between <stdatomic.h> and <atomic>

Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60932
Bug: https://reviews.llvm.org/D45470

This 2 headers combined will cause errors for both GCC and Clang. This patch
makes sure only one of them is present at any time.

Gbp-Pq: Topic system/core
Gbp-Pq: Name stdatomic.patch

libusb.h comes from different location

Forwarded: not-needed
Last-Update: 2018-05-26

Gbp-Pq: Topic system/core
Gbp-Pq: Name libusb-header-path.patch

Added missing headers causing compile errors

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name Added-missing-headers.patch

Update log file directory.

Last Updated: 2018-05-17

Last Updated: 2018-05-17

Gbp-Pq: Topic system/core
Gbp-Pq: Name move-log-file-to-proper-dir.patch

Added missing headers causing compile errors

Forwarded: not-needed

Gbp-Pq: Topic libnativehelper
Gbp-Pq: Name add-missing-headers.patch

Off-by-one error in the dwarf_to_unw_regnum function in include/dwarf_i.h in

libunwind 1.1 allows local users to have unspecified impact via invalid dwarf opcodes.

Gbp-Pq: Topic external/libunwind
Gbp-Pq: Name 20150704-CVE-2015-3239_dwarf_i.h.patch

Replace the legacy __sync built-in functions with __atomic ones

Last-Update: 2016-10-04
Forwarded: not-needed

libunwind uses the built-in __sync_* functions which are deprecated by GCC and
should be replaced by __atomic_* ones. See the official manuals [1].

The legacy __sync functions do not require to specify the memory order but
__atomic ones do, so we choose the strongest one: __ATOMIC_SEQ_CST.

We do this because __sync_fetch_and_add() is not supported on armel.

[1]: https://gcc.gnu.org/onlinedocs/gcc/_005f_005fsync-Builtins.html

Gbp-Pq: Topic external/libunwind
Gbp-Pq: Name legacy_built-in_sync_functions.patch

Manual definition of struct user_pt_regs

Last-Update: 2016-08-24
Forwarded: not-needed

On ARM64, libunwind uses struct user_pt_regs which is not defined in
anywhere, which causes FTBFS.

Gbp-Pq: Topic external/libunwind
Gbp-Pq: Name user_pt_regs.patch

Fix header path to get rid of compile errors

Forwarded: not-needed
Last-Update: 2018-06-13

Gbp-Pq: Topic external/selinux
Gbp-Pq: Name Fix-header-path.patch

android-platform-tools (29.0.6-23) unstable; urgency=medium

  * Fix CVE-2022-20128 and CVE-2022-3168
  * debian/source/lintian-overrides: Fix lintian.
  * Apply multi-arch hints
  * Sync with experimental to support adb and fastboot on ppc64el.

[dgit import unpatched android-platform-tools 29.0.6-23]

Import android-platform-tools_29.0.6-23.debian.tar.xz

[dgit import tarball android-platform-tools 29.0.6-23 android-platform-tools_29.0.6-23.debian.tar.xz]

Merge version 29.0.6-21+rpi1 and 29.0.6-22 to produce 29.0.6-22+rpi1

Merge android-platform-tools (29.0.6-22) import into refs/heads/workingbranch

Switch to an assembler macro for CFI_RESTORE_STATE_AND_DEF_CFA

Newer versions of clang reject multiple assembler directives
on the same line, which breaks the preprocessor macro
CFI_RESTORE_STATE_AND_DEF_CFA. Fix it by making it an assembler
macro instead.

Bug: 191980979
Change-Id: I823ff9c66336931249d2bac40280b24ecdebd0cf
(cherry picked from commit 082659bcbf66c08e2ad9be88363c7ab88c50e114)

Gbp-Pq: Topic art
Gbp-Pq: Name add-assembler-macro.patch

Add missing 'std::' scope identifiers.

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name fix-standard-namespace-errors.patch

arm asm instruction

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name arm-asm-instruction.patch

Workaround cacheflush on arm

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name workaround-cacheflush-on-arm.patch

non-x86 arches do not have PAGE_SIZE

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name fix-build-on-non-x86.patch

Use `Stats*` instead of `Stats`

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name stats-incomplete-def.patch

Fix python interpreter name

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name python3-gen_mterp.patch

Add standard namespace scope resolution

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name method-reference-std-ns.patch

Fix concatenation of storage_mode string.

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name storage-mode-concat.patch

get libart building

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name image-space-dereference.patch

Conforms with the exception specification of `std::atomic`

Forwarded: not-needed

All constructors of `std::atomic` require `noexcept`. As a result, its members
must also be able to instantiate without any exception throwing.

Gbp-Pq: Topic art
Gbp-Pq: Name atomic-exception-specification.patch

Use `ucontext_t` instead of `ucontext`

Forwarded: not-needed

Both Bionic and glibc define a struct called `ucontext_t` but only Bionic
defines an alias `ucontext_t`. Let's use the more standardized one.

Gbp-Pq: Topic art
Gbp-Pq: Name ucontext.patch

somehow upstream builds don't need these headers :-/

Forwarded: not-needed

Gbp-Pq: Topic art
Gbp-Pq: Name missing-system-includes.patch