Update test project to support proguard.

The code read java resources using relative path which
breaks when the classes and their packages are renamed
(the java resource isn't moved to the new package name.)

Change-Id: I9b9d14288d8c16fd7342cd743251e5681bb0f1ef

14 files changed, 8 insertions, 6 deletions

diff --git a/testapps/basicJar/src/com/android/tests/basicjar/BasicJar.java b/testapps/basicJar/src/com/android/tests/basicjar/BasicJar.java
index fa8efa3..1046ce7 100644
--- a/testapps/basicJar/src/com/android/tests/basicjar/BasicJar.java
+++ b/testapps/basicJar/src/com/android/tests/basicjar/BasicJar.java
@@ -8,7 +8,7 @@ import java.io.InputStreamReader;
 public class BasicJar {
     
     public static String getContent() {
-        InputStream input = BasicJar.class.getResourceAsStream("basicJar.txt");
+        InputStream input = BasicJar.class.getResourceAsStream("/com/android/tests/basicjar/basicJar.txt");
         if (input == null) {
             return "FAILED TO FIND basicJar.txt";
         }
diff --git a/testapps/basicJar2/src/com/android/tests/basicjar2/BasicJar2.java b/testapps/basicJar2/src/com/android/tests/basicjar2/BasicJar2.java
index dec3eae..906fbc0 100644
--- a/testapps/basicJar2/src/com/android/tests/basicjar2/BasicJar2.java
+++ b/testapps/basicJar2/src/com/android/tests/basicjar2/BasicJar2.java
@@ -8,7 +8,7 @@ import java.io.InputStreamReader;
 public class BasicJar2 {
     
     public static String getContent() {
-        InputStream input = BasicJar2.class.getResourceAsStream("basicJar2.txt");
+        InputStream input = BasicJar2.class.getResourceAsStream("/com/android/tests/basicjar2/basicJar2.txt");
         if (input == null) {
             return "FAILED TO FIND basicJar2.txt";
         }
diff --git a/testapps/basicJar3/src/com/android/tests/basicjar3/BasicJar3.java b/testapps/basicJar3/src/com/android/tests/basicjar3/BasicJar3.java
index 60d021d..684b584 100644
--- a/testapps/basicJar3/src/com/android/tests/basicjar3/BasicJar3.java
+++ b/testapps/basicJar3/src/com/android/tests/basicjar3/BasicJar3.java
@@ -8,7 +8,7 @@ import java.io.InputStreamReader;
 public class BasicJar3 {
     
     public static String getContent() {
-        InputStream input = BasicJar3.class.getResourceAsStream("basicJar3.txt");
+        InputStream input = BasicJar3.class.getResourceAsStream("/com/android/tests/basicjar3/basicJar3.txt");
         if (input == null) {
             return "FAILED TO FIND basicJar3.txt";
         }
diff --git a/testapps/javaProjectTest/app/proguard-project.txt b/testapps/javaProjectTest/app/proguard-project.txt
index f2fe155..349f80f 100644
--- a/testapps/javaProjectTest/app/proguard-project.txt
+++ b/testapps/javaProjectTest/app/proguard-project.txt
@@ -18,3 +18,5 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+-adaptclassstrings
\ No newline at end of file
diff --git a/testapps/javaProjectTest/javaProject/libs/basicJar.jar b/testapps/javaProjectTest/javaProject/libs/basicJar.jar
index 6be0e7d..319ed02 100644
--- a/testapps/javaProjectTest/javaProject/libs/basicJar.jar
+++ b/testapps/javaProjectTest/javaProject/libs/basicJar.jar
diff --git a/testapps/javaProjectTest/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.java b/testapps/javaProjectTest/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.java
index 6f31d53..fe0e882 100644
--- a/testapps/javaProjectTest/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.java
+++ b/testapps/javaProjectTest/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.java
@@ -8,7 +8,7 @@ import java.io.InputStreamReader;
 public class JavaProject {
 
     public static String getContent() {
-        InputStream input = JavaProject.class.getResourceAsStream("JavaProject.txt");
+        InputStream input = JavaProject.class.getResourceAsStream("/com/android/tests/javaprojecttest/javaproject/JavaProject.txt");
         if (input == null) {
             return "FAILED TO FIND JavaProject.txt";
         }
diff --git a/testapps/javaProjectTest/javaProject2/libs/basicJar.jar b/testapps/javaProjectTest/javaProject2/libs/basicJar.jar
index 6be0e7d..319ed02 100644
--- a/testapps/javaProjectTest/javaProject2/libs/basicJar.jar
+++ b/testapps/javaProjectTest/javaProject2/libs/basicJar.jar
diff --git a/testapps/javaProjectTest/javaProject2/src/com/android/tests/javaprojecttest/javaproject2/JavaProject2.java b/testapps/javaProjectTest/javaProject2/src/com/android/tests/javaprojecttest/javaproject2/JavaProject2.java
index 3d7a60a..5324fc1 100644
--- a/testapps/javaProjectTest/javaProject2/src/com/android/tests/javaprojecttest/javaproject2/JavaProject2.java
+++ b/testapps/javaProjectTest/javaProject2/src/com/android/tests/javaprojecttest/javaproject2/JavaProject2.java
@@ -8,7 +8,7 @@ import java.io.InputStreamReader;
 public class JavaProject2 {
 
     public static String getContent() {
-        InputStream input = JavaProject2.class.getResourceAsStream("JavaProject2.txt");
+        InputStream input = JavaProject2.class.getResourceAsStream("/com/android/tests/javaprojecttest/javaproject2/JavaProject2.txt");
         if (input == null) {
             return "FAILED TO FIND JavaProject2.txt";
         }
diff --git a/testapps/javaProjectTest/javaProject3/libs/basicJar2.jar b/testapps/javaProjectTest/javaProject3/libs/basicJar2.jar
index 5b9b629..5af7cf0 100644
--- a/testapps/javaProjectTest/javaProject3/libs/basicJar2.jar
+++ b/testapps/javaProjectTest/javaProject3/libs/basicJar2.jar
diff --git a/testapps/javaProjectTest/javaProject3/src/com/android/tests/javaprojecttest/javaproject3/JavaProject3.java b/testapps/javaProjectTest/javaProject3/src/com/android/tests/javaprojecttest/javaproject3/JavaProject3.java
index 190dfc1..bafe082 100644
--- a/testapps/javaProjectTest/javaProject3/src/com/android/tests/javaprojecttest/javaproject3/JavaProject3.java
+++ b/testapps/javaProjectTest/javaProject3/src/com/android/tests/javaprojecttest/javaproject3/JavaProject3.java
@@ -8,7 +8,7 @@ import java.io.InputStreamReader;
 public class JavaProject3 {
 
     public static String getContent() {
-        InputStream input = JavaProject3.class.getResourceAsStream("JavaProject3.txt");
+        InputStream input = JavaProject3.class.getResourceAsStream("/com/android/tests/javaprojecttest/javaproject3/JavaProject3.txt");
         if (input == null) {
             return "FAILED TO FIND JavaProject3.txt";
         }
diff --git a/testapps/javaProjectTest/lib1/jars/basicJar3.jar b/testapps/javaProjectTest/lib1/jars/basicJar3.jar
index b4fbb94..3fbf064 100644
--- a/testapps/javaProjectTest/lib1/jars/basicJar3.jar
+++ b/testapps/javaProjectTest/lib1/jars/basicJar3.jar
diff --git a/testapps/legacyTest/libs/basicJar.jar b/testapps/legacyTest/libs/basicJar.jar
index 6be0e7d..319ed02 100644
--- a/testapps/legacyTest/libs/basicJar.jar
+++ b/testapps/legacyTest/libs/basicJar.jar
diff --git a/testapps/libWithLibTest/lib2/libs/basicJar.jar b/testapps/libWithLibTest/lib2/libs/basicJar.jar
index 6be0e7d..319ed02 100644
--- a/testapps/libWithLibTest/lib2/libs/basicJar.jar
+++ b/testapps/libWithLibTest/lib2/libs/basicJar.jar
diff --git a/testapps/userLibTest/jars/basicJar.jar b/testapps/userLibTest/jars/basicJar.jar
index 6be0e7d..319ed02 100644
--- a/testapps/userLibTest/jars/basicJar.jar
+++ b/testapps/userLibTest/jars/basicJar.jar