パッチに失敗する
aorinngoDo opened this issue · comments
frameworks/base packages/apps/Settings でブランチが切り替えられたことや，フォントが追加されたこと等が原因でパッチエラーが非常に多くなっています
修正いただけると助かります
Log
>> [Fri Mar 24 03:34:46 JST 2023] Applying the patch to bootable/recovery
>> [Fri Mar 24 03:34:46 JST 2023] Applying the patch to build/make
>> [Fri Mar 24 03:34:46 JST 2023] Applying the patch to build/soong
>> [Fri Mar 24 03:34:46 JST 2023] Applying the patch to frameworks/base
error: patch failed: core/java/android/provider/Settings.java:12045
error: core/java/android/provider/Settings.java: patch does not apply
error: patch failed: core/java/com/android/internal/util/crdroid/PixelPropsUtils.java:1
error: core/java/com/android/internal/util/crdroid/PixelPropsUtils.java: patch does not apply
error: patch failed: core/res/res/values/cr_config.xml:103
error: core/res/res/values/cr_config.xml: patch does not apply
error: patch failed: core/res/res/values/cr_symbols.xml:101
error: core/res/res/values/cr_symbols.xml: patch does not apply
error: patch failed: packages/SystemUI/Android.bp:128
error: packages/SystemUI/Android.bp: patch does not apply
error: patch failed: packages/SystemUI/res/values/cr_strings.xml:157
error: packages/SystemUI/res/values/cr_strings.xml: patch does not apply
error: patch failed: packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java:481
error: packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java: patch does not apply
error: patch failed: packages/SystemUI/src/com/android/systemui/privacy/AppOpsPrivacyItemMonitor.kt:53
error: packages/SystemUI/src/com/android/systemui/privacy/AppOpsPrivacyItemMonitor.kt: patch does not apply
error: patch failed: packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java:40
error: packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java: patch does not apply
error: patch failed: packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt:94
error: packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt: patch does not apply
error: patch failed: packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java:29
error: packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java: patch does not apply
error: patch failed: services/core/Android.bp:178
error: services/core/Android.bp: patch does not apply
error: patch failed: services/core/java/com/android/server/biometrics/AuthSession.java:70
error: services/core/java/com/android/server/biometrics/AuthSession.java: patch does not apply
error: patch failed: services/core/java/com/android/server/biometrics/BiometricService.java:85
error: services/core/java/com/android/server/biometrics/BiometricService.java: patch does not apply
error: patch failed: services/core/java/com/android/server/biometrics/PreAuthInfo.java:42
error: services/core/java/com/android/server/biometrics/PreAuthInfo.java: patch does not apply
error: patch failed: services/core/java/com/android/server/biometrics/sensors/face/FaceService.java:25
error: services/core/java/com/android/server/biometrics/sensors/face/FaceService.java: patch does not apply
error: services/core/java/com/android/server/biometrics/sensors/face/custom/ArrayUtils.java: No such file or directory
error: services/core/java/com/android/server/biometrics/sensors/face/custom/BiometricTestSessionImpl.java: No such file or directory
error: services/core/java/com/android/server/biometrics/sensors/face/custom/CustomFaceProvider.java: No such file or directory
error: services/core/java/com/android/server/biometrics/sensors/face/custom/FaceAuthenticationClient.java: No such file or directory
error: services/core/java/com/android/server/biometrics/sensors/face/custom/FaceEnrollClient.java: No such file or directory
error: services/core/java/com/android/server/biometrics/sensors/face/custom/FaceGenerateChallengeClient.java: No such file or directory
error: services/core/java/com/android/server/biometrics/sensors/face/custom/FaceGetFeatureClient.java: No such file or directory
error: services/core/java/com/android/server/biometrics/sensors/face/custom/FaceInternalCleanupClient.java: No such file or directory
error: services/core/java/com/android/server/biometrics/sensors/face/custom/FaceInternalEnumerateClient.java: No such file or directory
error: services/core/java/com/android/server/biometrics/sensors/face/custom/FaceRemovalClient.java: No such file or directory
error: services/core/java/com/android/server/biometrics/sensors/face/custom/FaceResetLockoutClient.java: No such file or directory
error: services/core/java/com/android/server/biometrics/sensors/face/custom/FaceRevokeChallengeClient.java: No such file or directory
error: services/core/java/com/android/server/biometrics/sensors/face/custom/FaceSetFeatureClient.java: No such file or directory
error: services/core/java/com/android/server/biometrics/sensors/face/custom/FaceUpdateActiveUserClient.java: No such file or directory
error: services/core/java/com/android/server/biometrics/sensors/face/custom/TestHal.java: No such file or directory
error: patch failed: services/core/java/com/android/server/policy/PermissionPolicyService.java:103
error: services/core/java/com/android/server/policy/PermissionPolicyService.java: patch does not apply
>> [Fri Mar 24 03:34:46 JST 2023] -- Removing PixelPropsUtils.java
rm 'core/java/com/android/internal/util/crdroid/PixelPropsUtils.java'
>> [Fri Mar 24 03:34:46 JST 2023] Applying the patch to lineage-sdk
>> [Fri Mar 24 03:34:46 JST 2023] -- Rebranding crDroid to FlokoROM
>> [Fri Mar 24 03:34:46 JST 2023] Applying the patch to packages/apps/crDroidSettings
>> [Fri Mar 24 03:34:46 JST 2023] Applying the patch to packages/apps/LineageParts
>> [Fri Mar 24 03:34:46 JST 2023] -- Rebranding crDroid to FlokoROM
>> [Fri Mar 24 03:34:46 JST 2023] Applying the patch to packages/apps/Settings
error: patch failed: Android.bp:110
error: Android.bp: patch does not apply
error: patch failed: AndroidManifest.xml:123
error: AndroidManifest.xml: patch does not apply
error: res/layout/face_enroll_button.xml: already exists in working directory
error: res/layout/face_enroll_introduction_invisible.xml: No such file or directory
error: res/layout/face_remove_button.xml: already exists in working directory
error: patch failed: res/xml/about_legal.xml:38
error: res/xml/about_legal.xml: patch does not apply
error: patch failed: res/xml/configure_notification_settings.xml:98
error: res/xml/configure_notification_settings.xml: patch does not apply
error: patch failed: res/xml/security_lockscreen_settings.xml:28
error: res/xml/security_lockscreen_settings.xml: patch does not apply
error: patch failed: res/xml/security_settings_combined_biometric.xml:43
error: res/xml/security_settings_combined_biometric.xml: patch does not apply
error: patch failed: res/xml/security_settings_face.xml:33
error: res/xml/security_settings_face.xml: patch does not apply
error: patch failed: res/xml/top_level_settings.xml:180
error: res/xml/top_level_settings.xml: patch does not apply
error: patch failed: src/com/android/settings/biometrics/BiometricEnrollActivity.java:56
error: src/com/android/settings/biometrics/BiometricEnrollActivity.java: patch does not apply
error: patch failed: src/com/android/settings/biometrics/BiometricEnrollIntroduction.java:59
error: src/com/android/settings/biometrics/BiometricEnrollIntroduction.java: patch does not apply
error: patch failed: src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceController.java:28
error: src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceController.java: patch does not apply
error: patch failed: src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceController.java:26
error: src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceController.java: patch does not apply
error: src/com/android/settings/biometrics/combination/BiometricWaysToUsePreferenceController.java: No such file or directory
error: patch failed: src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java:20
error: src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java: patch does not apply
error: patch failed: src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java:27
error: src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java: patch does not apply
error: patch failed: src/com/android/settings/biometrics/face/FaceSettings.java:52
error: src/com/android/settings/biometrics/face/FaceSettings.java: patch does not apply
error: patch failed: src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceController.java:25
error: src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceController.java: patch does not apply
error: patch failed: src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java:27
error: src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java: patch does not apply
error: patch failed: src/com/android/settings/biometrics/face/FaceSettingsConfirmPreferenceController.java:30
error: src/com/android/settings/biometrics/face/FaceSettingsConfirmPreferenceController.java: patch does not apply
error: patch failed: src/com/android/settings/biometrics/face/FaceSettingsEnrollButtonPreferenceController.java:20
error: src/com/android/settings/biometrics/face/FaceSettingsEnrollButtonPreferenceController.java: patch does not apply
error: patch failed: src/com/android/settings/biometrics/face/FaceSettingsKeyguardPreferenceController.java:28
error: src/com/android/settings/biometrics/face/FaceSettingsKeyguardPreferenceController.java: patch does not apply
error: patch failed: src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java:83
error: src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java: patch does not apply
error: src/com/android/settings/biometrics/face/FaceSettingsLockscreenUnlockMethodPreferenceController.java: No such file or directory
error: patch failed: src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java:25
error: src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java: patch does not apply
error: patch failed: src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java:18
error: src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java: patch does not apply
error: patch failed: src/com/android/settings/biometrics/face/FaceStatusUtils.java:26
error: src/com/android/settings/biometrics/face/FaceStatusUtils.java: patch does not apply
error: patch failed: src/com/android/settings/biometrics/face/FaceUnlockCategoryPreferenceController.java:20
error: src/com/android/settings/biometrics/face/FaceUnlockCategoryPreferenceController.java: patch does not apply
error: src/com/android/settings/custom/biometrics/FaceUtils.java: No such file or directory
error: src/com/android/settings/custom/biometrics/face/FaceEnrollActivity.java: No such file or directory
error: src/com/android/settings/custom/biometrics/face/FaceSettingsRedoPreferenceController.java: No such file or directory
error: src/com/android/settings/deviceinfo/firmwareversion/AboutDeviceNamePreferenceController.java: No such file or directory
error: patch failed: src/com/android/settings/homepage/contextualcards/FaceReEnrollDialog.java:33
error: src/com/android/settings/homepage/contextualcards/FaceReEnrollDialog.java: patch does not apply
>> [Fri Mar 24 03:34:46 JST 2023] Applying the patch to packages/apps/SetupWizard
error: patch failed: src/org/lineageos/setupwizard/LineageSettingsActivity.java:46
error: src/org/lineageos/setupwizard/LineageSettingsActivity.java: patch does not apply
>> [Fri Mar 24 03:34:46 JST 2023] -- Rebranding crDroid to FlokoROM
>> [Fri Mar 24 03:34:46 JST 2023] Applying the patch to vendor/addons
error: patch failed: config.mk:40
error: config.mk: patch does not apply
>> [Fri Mar 24 03:34:47 JST 2023] Applying the patch to vendor/lineage
error: patch failed: config/version.mk:1
error: config/version.mk: patch does not apply
>> [Fri Mar 24 03:34:47 JST 2023] -- Removing version.mk
rm 'config/version.mk'
パッチ は コケないとこまで持っていったのでビルドと動作確認後に更新します…
動くパッチはできた(01e93c8)けど、本家側の問題がいくらかあって修正待ちです
- そもそも本家もビルドが通らない
- Pull Request投げてるのでmerge待ち
- 一応同じ内容を含んでるのでビルドは通るようにしたはず
- 逆に、merge後はこのリポジトリ上のパッチから消すのを忘れないようにする
- 現状crDroidSettingsが設定から消えてるっぽい
- というか3月パッチ分を作り直してるっぽいところ、結構な機能がまだ戻ってない
- よく見たらバージョン番号が
9.3-ALPHAになってる
色々とご面倒をおかけしました
ありがとうございます