Merge branch 'google' into 'master'

1 files changed, 15 insertions, 0 deletions

diff --git a/preinstrumented/src/main/java/org/robolectric/preinstrumented/JarInstrumentor.java b/preinstrumented/src/main/java/org/robolectric/preinstrumented/JarInstrumentor.java
index ed5769215..c23798eaa 100644
--- a/preinstrumented/src/main/java/org/robolectric/preinstrumented/JarInstrumentor.java
+++ b/preinstrumented/src/main/java/org/robolectric/preinstrumented/JarInstrumentor.java
@@ -8,6 +8,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Enumeration;
 import java.util.Locale;
+import java.util.Properties;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
@@ -64,6 +65,13 @@ public class JarInstrumentor {
     int nonClassCount = 0;
     int classCount = 0;
 
+    // get the jar's SDK version
+    try {
+      classInstrumentor.setAndroidJarSDKVersion(getJarAndroidSDKVersion(jarFile));
+    } catch (Exception e) {
+      throw new AssertionError("Unable to get Android SDK version from Jar File", e);
+    }
+
     try (JarOutputStream jarOut =
         new JarOutputStream(new BufferedOutputStream(new FileOutputStream(destFile), ONE_MB))) {
       Enumeration<JarEntry> entries = jarFile.entries();
@@ -136,4 +144,11 @@ public class JarInstrumentor {
     entry.setTime(original.getTime());
     return entry;
   }
+
+  private int getJarAndroidSDKVersion(JarFile jarFile) throws IOException {
+    ZipEntry buildProp = jarFile.getEntry("build.prop");
+    Properties buildProps = new Properties();
+    buildProps.load(jarFile.getInputStream(buildProp));
+    return Integer.parseInt(buildProps.getProperty("ro.build.version.sdk"));
+  }
 }