commit 17fea3e29e06aa364b040a696c78251fc44bc2cd
author Florian Mayer <fmayer@google.com> Tue Jan 26 23:19:00 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 26 23:19:00 2021 +0000
tree 820a00676193a2bf69966c66217fb513a58827ae
parent d7ace570d9f4fafcf08bbe07587bbf40698269cb
parent 97da7a33b0bede67a564f36f673d6551297c64b5

Merge "Roll libprocinfo and libunwindstack."

buildtools/BUILD.gn

diff --git a/buildtools/BUILD.gn b/buildtools/BUILD.gn
index c3ad7a8..7815171 100644
--- a/buildtools/BUILD.gn
+++ b/buildtools/BUILD.gn
@@ -1012,6 +1012,7 @@
     "android-unwinding/libunwindstack/MapInfo.cpp",
     "android-unwinding/libunwindstack/Maps.cpp",
     "android-unwinding/libunwindstack/Memory.cpp",
+    "android-unwinding/libunwindstack/MemoryMte.cpp",
     "android-unwinding/libunwindstack/Regs.cpp",
     "android-unwinding/libunwindstack/RegsArm.cpp",
     "android-unwinding/libunwindstack/RegsArm64.cpp",

tools/install-build-deps

diff --git a/tools/install-build-deps b/tools/install-build-deps
index 6d513c5..0768e7e 100755
--- a/tools/install-build-deps
+++ b/tools/install-build-deps
@@ -205,7 +205,7 @@
     Dependency(
         'buildtools/android-unwinding',
         'https://android.googlesource.com/platform/system/unwinding.git',
-        'a449157de3531a05c138bfac2894e4831c869f6b', 'all'),
+        '706149b745e847bb66ee965135499e196fa11b66', 'all'),
     Dependency('buildtools/android-logging',
                'https://android.googlesource.com/platform/system/logging.git',
                '7b36b566c9113fc703d68f76e8f40c0c2432481c', 'all'),
@@ -215,7 +215,7 @@
     Dependency(
         'buildtools/android-libprocinfo',
         'https://android.googlesource.com/platform/system/libprocinfo.git',
-        'bd752195f52109fb0dca525236ab9dec74b986e1', 'all'),
+        'fd214c13ededecae97a3b15b5fccc8925a749a84', 'all'),
     Dependency('buildtools/lzma',
                'https://android.googlesource.com/platform/external/lzma.git',
                '7851dce6f4ca17f5caa1c93a4e0a45686b1d56c3', 'all'),