commit bf7925a994bf8fbcf2304f6a868c3adfeaed6203
author Karl Pauls <pauls@apache.org> Thu Oct 16 16:50:12 2008 +0000
committer Karl Pauls <pauls@apache.org> Thu Oct 16 16:50:12 2008 +0000
tree c95714a130d5d9781c2865b8ed3e5aa4a6ed969d
parent e1622af90fd9a97e8b66b75c373d5c5b0bfa5d35

Update felix to work with the latest version of the android sdk (1.0.0.-rc1).

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@705282 13f79535-47bb-0310-9956-ffa450edef68

framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java

diff --git a/framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java
index 286834a..6ffe043 100644
--- a/framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java
+++ b/framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java
@@ -43,7 +43,16 @@
         Method dexFileClassLoadClass = null;
         try
         {
-            Class dexFileClass =  Class.forName("android.dalvik.DexFile");
+            Class dexFileClass;
+            try
+            {
+                dexFileClass = Class.forName("dalvik.system.DexFile");
+            }
+            catch (Exception ex)
+            {
+                dexFileClass = Class.forName("android.dalvik.DexFile");
+            }
+            
             dexFileClassConstructor = dexFileClass.getConstructor(
                 new Class[] { java.io.File.class });
             dexFileClassLoadClass = dexFileClass.getMethod("loadClass",