[Support]flyme help CONFLICTS_HAPPENED

575

1

2018-03-17 01:51

Show all posts
HI
i need help to fix CONFLICTS
3 conflicts in boot.img.out
15 conflicts in services.jar.out
18 conflicts in 7 files, go through the reject files in 'autopatch/reject' to find them out


  1. #
  2. # ADDITIONAL_DEFAULT_PROPERTIES
  3. #
  4. ro.adb.secure=1
  5. ro.secure=1
  6. security.perf_harden=1
  7. ro.allow.mock.location=0
  8. ro.debuggable=1
  9. ro.zygote=zygote32
  10. dalvik.vm.image-dex2oat-Xms=64m
  11. dalvik.vm.image-dex2oat-Xmx=64m
  12. dalvik.vm.dex2oat-Xms=64m
  13. dalvik.vm.dex2oat-Xmx=512m
  14. ro.dalvik.vm.native.bridge=0
  15. debug.atrace.tags.enableflags=0
  16. #
  17. # BOOTIMAGE_BUILD_PROPERTIES
  18. #
  19. <<<<<<< VENDOR #Conflict 0
  20. ro.bootimage.build.date=Tue Sep 27 10:41:43 JST 2016
  21. ro.bootimage.build.date.utc=1474940503
  22. ro.bootimage.build.fingerprint=samsung/cm_ks01ltexx/ks01ltexx:6.0.1/MOB30Z/aaff3b3ab7:userdebug/test-keys
  23. persist.sys.usb.config=mtp,adb
  24. =======
  25. ro.bootimage.build.date=2017年 05月 11日 星期四 10:26:30 CST
  26. ro.bootimage.build.date.utc=1494469590
  27. ro.bootimage.build.fingerprint=google/cm_angler/angler:6.0.1/MOB31K/26e68903ed:userdebug/test-keys
  28. persist.sys.usb.config=mtp,adb
  29. >>>>>>> BOSP #Conflict 0
Copy the Code