commit 6d1d340f8b11aeb2bce73c02b0a0d063c22b3821
author Christopher Ferris <cferris@google.com> Wed Aug 02 19:52:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 02 19:52:08 2017 +0000
tree 5f967120e0e46b175995cd96723aa88b6e04736d
parent 9c234b0144ef64a3b3c8029bc1daebaa8a14a959
parent 63bade8d1a82ce90525b602daae891cf5813e1b2

Merge "Allow mips to build." am: 7009a3ccf7 am: 3b6bbb8178
am: fa700068f8

Change-Id: I9a3e85f2223d6b6e520056fb156b9158a277d41e

libunwindstack/Android.bp

diff --git a/libunwindstack/Android.bp b/libunwindstack/Android.bp
index 04c4cfa..78ae409 100644
--- a/libunwindstack/Android.bp
+++ b/libunwindstack/Android.bp
@@ -30,15 +30,6 @@
             enabled: false,
         },
     },
-
-    arch: {
-        mips: {
-            enabled: false,
-        },
-        mips64: {
-            enabled: false,
-        },
-    },
 }
 
 cc_library {

libunwindstack/include/unwindstack/RegsGetLocal.h

diff --git a/libunwindstack/include/unwindstack/RegsGetLocal.h b/libunwindstack/include/unwindstack/RegsGetLocal.h
index ffec213..d1461d8 100644
--- a/libunwindstack/include/unwindstack/RegsGetLocal.h
+++ b/libunwindstack/include/unwindstack/RegsGetLocal.h
@@ -97,6 +97,11 @@
   regs->SetFromRaw();
 }
 
+#elif defined(__mips__)
+
+// Stub to allow mips to build.
+void RegsGetLocal(Regs*) {}
+
 #endif
 
 }  // namespace unwindstack