commit 031768a340634e2dbdec1aebb2bb3fe509b2f1f6
author Mathieu Chartier <mathieuc@google.com> Thu Aug 27 10:25:02 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Thu Aug 27 15:16:30 2015 -0700
tree dcc51b140b69e90f60045d846f4c890bd322e1ad
parent dfb5f9ceb277f30ee961b27e72d968e0695611a6

Add non debug version of libarttest

We now pass the libarttest as an argument to the java program. This
enables using libarttestd by default and libarttest when -O is
specified.

Change-Id: I0de1ae01e2bb5f7b9c7fd7487b6cb55051f60657

test/137-cfi/src/Main.java

diff --git a/test/137-cfi/src/Main.java b/test/137-cfi/src/Main.java
index 6cd187a..dc3ef7e 100644
--- a/test/137-cfi/src/Main.java
+++ b/test/137-cfi/src/Main.java
@@ -41,6 +41,7 @@
   }
 
   public static void main(String[] args) throws Exception {
+    System.loadLibrary(args[0]);
       boolean secondary = false;
       if (args.length > 0 && args[args.length - 1].equals("--secondary")) {
           secondary = true;
@@ -48,10 +49,6 @@
       new Main(secondary).run();
   }
 
-  static {
-      System.loadLibrary("arttest");
-  }
-
   private void run() {
       if (secondary) {
           if (!TEST_REMOTE_UNWINDING) {