search

MiCode / patchrom

Use disassemble/assemble technology to porting miui to misc android devices
http://micode.net/forum-55-1.html
493 stars 370 forks source link

I couldn't solve the reject #162

Open EmreK42 opened 4 years ago

EmreK42 commented 4 years ago

I get these errors after the firstpatch command /home/emre/bin/patchrom/tools/patch_miui_framework.sh /home/emre/bin/patchrom/android/base-framework /home/emre/bin/patchrom/android/primary-patch pwd <<< create temp directory to store the old, new source and destination smali code with .line removed <<< compute the difference between /home/emre/bin/patchrom/g800h/temp/old_smali/services.jar.out and /home/emre/bin/patchrom/g800h/temp/new_smali/services.jar.out <<< apply the patch into the /home/emre/bin/patchrom/g800h/services.jar.out patching file /home/emre/bin/patchrom/g800h/services.jar.out/./smali/com/android/server/am/ActivityManagerService.smali Hunk #1 succeeded at 84757 (offset 1778 lines). patching file /home/emre/bin/patchrom/g800h/services.jar.out/./smali/com/android/server/am/ActivityStack.smali Hunk #1 FAILED at 6636. 1 out of 1 hunk FAILED -- saving rejects to file /home/emre/bin/patchrom/g800h/temp/reject/services.jar.out/./smali/com/android/server/am/ActivityStack.smali.rej patching file /home/emre/bin/patchrom/g800h/services.jar.out/./smali/com/android/server/wm/WindowManagerService.smali Hunk #1 FAILED at 708. 1 out of 1 hunk FAILED -- saving rejects to file /home/emre/bin/patchrom/g800h/temp/reject/services.jar.out/./smali/com/android/server/wm/WindowManagerService.smali.rej patching file /home/emre/bin/patchrom/g800h/services.jar.out/./smali/com/android/server/power/ShutdownThread.smali Hunk #1 FAILED at 312. 1 out of 1 hunk FAILED -- saving rejects to file /home/emre/bin/patchrom/g800h/temp/reject/services.jar.out/./smali/com/android/server/power/ShutdownThread.smali.rej patching file /home/emre/bin/patchrom/g800h/services.jar.out/./smali/com/android/server/policy/PhoneWindowManager.smali Hunk #1 succeeded at 569 (offset 106 lines). patching file /home/emre/bin/patchrom/g800h/services.jar.out/./smali/com/android/server/SystemServer.smali Hunk #1 succeeded at 153 (offset 11 lines). <<< compute the difference between /home/emre/bin/patchrom/g800h/temp/old_smali/wifi-service.jar.out and /home/emre/bin/patchrom/g800h/temp/new_smali/wifi-service.jar.out <<< apply the patch into the /home/emre/bin/patchrom/g800h/wifi-service.jar.out <<< compute the difference between /home/emre/bin/patchrom/g800h/temp/old_smali/framework.jar.out and /home/emre/bin/patchrom/g800h/temp/new_smali/framework.jar.out <<< apply the patch into the /home/emre/bin/patchrom/g800h/framework.jar.out patching file /home/emre/bin/patchrom/g800h/framework.jar.out/./smali/com/android/internal/os/ZygoteInit.smali Hunk #1 succeeded at 348 (offset 1 line). patching file /home/emre/bin/patchrom/g800h/framework.jar.out/./smali/android/app/SystemServiceRegistry.smali Hunk #1 succeeded at 834 (offset 84 lines). patching file /home/emre/bin/patchrom/g800h/framework.jar.out/./smali/android/app/ResourcesManager.smali Hunk #1 FAILED at 986. 1 out of 1 hunk FAILED -- saving rejects to file /home/emre/bin/patchrom/g800h/temp/reject/framework.jar.out/./smali/android/app/ResourcesManager.smali.rej patching file /home/emre/bin/patchrom/g800h/framework.jar.out/./smali/android/graphics/Bitmap.smali Hunk #1 succeeded at 43 (offset 2 lines). patching file /home/emre/bin/patchrom/g800h/framework.jar.out/./smali/android/content/pm/PackageParser.smali Hunk #1 FAILED at 9660. Hunk #2 succeeded at 9977 with fuzz 2 (offset 305 lines). 1 out of 2 hunks FAILED -- saving rejects to file /home/emre/bin/patchrom/g800h/temp/reject/framework.jar.out/./smali/android/content/pm/PackageParser.smali.rej patching file /home/emre/bin/patchrom/g800h/framework.jar.out/./smali/android/content/res/Resources.smali Hunk #2 succeeded at 868 (offset 17 lines). Hunk #3 succeeded at 4537 with fuzz 2 (offset 10 lines). <<< compute the difference between /home/emre/bin/patchrom/g800h/temp/old_smali/telephony-common.jar.out and /home/emre/bin/patchrom/g800h/temp/new_smali/telephony-common.jar.out <<< apply the patch into the /home/emre/bin/patchrom/g800h/telephony-common.jar.out

patch miui into target framework is done. Please look at /home/emre/bin/patchrom/g800h/temp/reject to resolve any conflicts!