3 files changed, 6 insertions, 2 deletions
diff --git a/src/build-framework-gen.xml b/src/build-framework-gen.xml
index c23ba7e..674ab30 100644
--- a/src/build-framework-gen.xml
+++ b/src/build-framework-gen.xml
@@ -14,6 +14,7 @@
   <property name="android-201-jar" value="android_v201.jar"/>
   <property name="android-21-jar" value="android_v21.jar"/>
   <property name="android-22-jar" value="android_v22.jar"/>
+  <property name="android-23-jar" value="android_v23.jar"/>
 
   <!-- property name="framework.mock-bin" value=see build.properties -->
   <!-- property name="framework.mock-jar" value=see build.properties -->
@@ -43,6 +44,7 @@
     <generate-framework-mocks api-jar-file="${android-201-jar}" api-level="6"/>
     <generate-framework-mocks api-jar-file="${android-21-jar}" api-level="7"/>
     <generate-framework-mocks api-jar-file="${android-22-jar}" api-level="8"/>
+  	<generate-framework-mocks api-jar-file="${android-23-jar}" api-level="9"/>
     <jar destfile="${framework.mock-bin}/${framework.mock-jar}"
          basedir="${framework.mock-staging}" includes="**/*.class" index="true"/>
   </target>
diff --git a/src/com/google/android/testing/mocking/FileUtils.java b/src/com/google/android/testing/mocking/FileUtils.java
index f759c57..b03a2c5 100644
--- a/src/com/google/android/testing/mocking/FileUtils.java
+++ b/src/com/google/android/testing/mocking/FileUtils.java
@@ -62,7 +62,9 @@ public class FileUtils {
     if (!filename.endsWith(".class")) {
       throw new IllegalArgumentException("Argument provided is not a class filename: " + filename);
     }
-    return filename.replace(File.separatorChar, '.').substring(0, filename.length() - 6);
+    // On non-Linux, files use the native separator, but jar entries use /... sigh
+    return filename.replace(File.separatorChar, '.').replace('/', '.')
+        .substring(0, filename.length() - 6);
   }
 
   static void saveClassToFolder(GeneratedClassFile clazz, String outputFolderName)
diff --git a/src/com/google/android/testing/mocking/SdkVersion.java b/src/com/google/android/testing/mocking/SdkVersion.java
index ee61707..ed1424b 100644
--- a/src/com/google/android/testing/mocking/SdkVersion.java
+++ b/src/com/google/android/testing/mocking/SdkVersion.java
@@ -27,7 +27,7 @@ import java.util.List;
  */
 public enum SdkVersion {
   UNKNOWN("", -1), CUPCAKE("v15", 3), DONUT("v16", 4), ECLAIR_0_1("v201", 6),
-  ECLAIR_MR1("v21", 7), FROYO("v22", 8);
+  ECLAIR_MR1("v21", 7), FROYO("v22", 8), GINGERBREAD("v23", 9);
 
   private static final int SDK_VERSION;