aboutsummaryrefslogtreecommitdiff
path: root/resources/src/main/java/org/robolectric/res/ResName.java
diff options
context:
space:
mode:
Diffstat (limited to 'resources/src/main/java/org/robolectric/res/ResName.java')
-rw-r--r--resources/src/main/java/org/robolectric/res/ResName.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/resources/src/main/java/org/robolectric/res/ResName.java b/resources/src/main/java/org/robolectric/res/ResName.java
index e5fcd7ac4..42ce2b5c1 100644
--- a/resources/src/main/java/org/robolectric/res/ResName.java
+++ b/resources/src/main/java/org/robolectric/res/ResName.java
@@ -77,7 +77,14 @@ public class ResName {
return null;
}
- return new ResName(packageName == null ? defaultPackageName : packageName,
+ if (packageName == null) {
+ packageName = defaultPackageName;
+ } else if ("*android".equals(packageName)) {
+ packageName = "android";
+ }
+
+ return new ResName(
+ packageName,
type == null ? defaultType : type,
name);
}