Upstream some of useful logging and ShadowDateIntervalFormat update to Github

Update ShadowDateIntervalFormat due to DataIntervalFormat class moved to a diff package

PiperOrigin-RevId: 569516571

1 files changed, 5 insertions, 0 deletions

diff --git a/resources/src/main/java/org/robolectric/manifest/AndroidManifest.java b/resources/src/main/java/org/robolectric/manifest/AndroidManifest.java
index 2494c9d83..073b0fe17 100644
--- a/resources/src/main/java/org/robolectric/manifest/AndroidManifest.java
+++ b/resources/src/main/java/org/robolectric/manifest/AndroidManifest.java
@@ -21,6 +21,7 @@ import org.robolectric.pluginapi.UsesSdk;
 import org.robolectric.res.Fs;
 import org.robolectric.res.ResourcePath;
 import org.robolectric.res.ResourceTable;
+import org.robolectric.util.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -166,6 +167,8 @@ public class AndroidManifest implements UsesSdk {
       return;
     }
 
+    Logger.debug("Manifest file location: " + androidManifestFile);
+
     if (androidManifestFile != null && Files.exists(androidManifestFile)) {
       try {
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -175,6 +178,8 @@ public class AndroidManifest implements UsesSdk {
         Document manifestDocument = db.parse(inputStream);
         inputStream.close();
 
+        Logger.debug("Manifest doc location:\n%s", androidManifestFile.toString());
+
         if (!packageNameIsOverridden()) {
           packageName = getTagAttributeText(manifestDocument, "manifest", "package");
         }