commit 872be3dd78b811d4f0ae5c0330fd6f18da65c4df
author David Srbecky <dsrbecky@google.com> Mon Feb 05 17:30:01 2018 +0000
committer David Srbecky <dsrbecky@google.com> Tue Feb 06 14:45:05 2018 +0000
tree 20eab06232c77672ac9a55ba70c7e08a285f5c69
parent 09f86297e7f82176fb8bb78fee86249e012c3af7

Test unwind through multidex

Test: testrunner.py --host -t 137
Change-Id: I3b3caca2f01e12d5044735c01985acd2b2ae3112

test/137-cfi/cfi.cc

diff --git a/test/137-cfi/cfi.cc b/test/137-cfi/cfi.cc
index bdfb44a..0ea72f4 100644
--- a/test/137-cfi/cfi.cc
+++ b/test/137-cfi/cfi.cc
@@ -130,6 +130,7 @@
       "Java_Main_unwindInProcess",                   // This function.
       "Main.unwindInProcess",                        // The corresponding Java native method frame.
       "java.util.Arrays.binarySearch0",              // Framework method.
+      "Base.runBase",                                // Method in other dex file.
       "Main.main"                                    // The Java entry method.
   };
 
@@ -230,6 +231,7 @@
                                                      // resolved, so don't look for it right now.
         "Main.sleep",                                // The corresponding Java native method frame.
         "java.util.Arrays.binarySearch0",            // Framework method.
+        "Base.runBase",                              // Method in other dex file.
         "Main.main"                                  // The Java entry method.
     };
 

test/137-cfi/src-multidex/Base.java

diff --git a/test/137-cfi/src-multidex/Base.java b/test/137-cfi/src-multidex/Base.java
new file mode 100644
index 0000000..d3f8a56
--- /dev/null
+++ b/test/137-cfi/src-multidex/Base.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public abstract class Base {
+  abstract public void runImpl();
+  public void runBase() {
+    runImpl();
+  }
+}

test/137-cfi/src/Main.java

diff --git a/test/137-cfi/src/Main.java b/test/137-cfi/src/Main.java
index 1ec7072..9a2e352 100644
--- a/test/137-cfi/src/Main.java
+++ b/test/137-cfi/src/Main.java
@@ -20,7 +20,7 @@
 import java.util.Arrays;
 import java.util.Comparator;
 
-public class Main implements Comparator<Main> {
+public class Main extends Base implements Comparator<Main> {
   // Whether to test local unwinding.
   private boolean testLocal;
 
@@ -57,10 +57,10 @@
   }
 
   public static void main(String[] args) throws Exception {
-      new Main(args).run();
+      new Main(args).runBase();
   }
 
-  private void run() {
+  public void runImpl() {
       if (secondary) {
           if (!testRemote) {
               throw new RuntimeException("Should not be running secondary!");