Revert "Bypass font path prefix check in ResourcesCompat::loadFont" (…

…#1809)

paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/instrumentation/ResourcesCompatVisitorFactory.kt

@@ -41,10 +41,7 @@ internal abstract class ResourcesCompatVisitorFactory : AsmClassVisitorFactory<I
     private class LoadFontVisitor(api: Int, delegate: MethodVisitor) : MethodVisitor(api, delegate) {
       override fun visitMethodInsn(opcode: Int, owner: String, name: String, descriptor: String, isInterface: Boolean) {
         if ("startsWith" == name) {
-          // Make calls to `startsWith` return true
-          super.visitInsn(Opcodes.POP) // Pop the arg being passed to `startsWith`, which is "res/"
-          super.visitInsn(Opcodes.POP) // Pop the receiver of `startsWith`, which is the font file path
-          super.visitLdcInsn(1) // Push `1` to the stack, as if `startsWith` returned true
+          super.visitMethodInsn(opcode, owner, "contains", "(Ljava/lang/CharSequence;)Z", isInterface)
         } else {
           super.visitMethodInsn(opcode, owner, name, descriptor, isInterface)
         }

paparazzi-gradle-plugin/src/test/projects/custom-fonts/build.gradle

@@ -17,9 +17,6 @@ android {
   kotlinOptions {
     jvmTarget = libs.versions.javaTarget.get()
   }
-
-  // For testing loading font resources from directories other than 'res/'
-  sourceSets.main.res.srcDirs += 'src/main/other_resources_dir'
 }
 
 dependencies {