Move Trebuchet to default.xml

Even though this is a "custom" app, it is still a core part of android
that needs to be up to date with security patches and QPR updates.
Move it to the main manifest to make aosp-merger work without
hardcoding Trebuchet in the merge scripts.

Change-Id: I1031d90067f4e3f87c93f90f527271c9ad578225
This commit is contained in:
Michael Bestas 2023-04-14 00:24:35 +03:00
parent d489e68cfe
commit 8d687257af
No known key found for this signature in database
GPG Key ID: CC95044519BE6669
2 changed files with 1 additions and 1 deletions

View File

@ -905,6 +905,7 @@
<project path="packages/apps/TimeZoneUpdater" name="platform/packages/apps/TimeZoneUpdater" groups="pdk" remote="aosp" /> <project path="packages/apps/TimeZoneUpdater" name="platform/packages/apps/TimeZoneUpdater" groups="pdk" remote="aosp" />
<project path="packages/apps/ThemePicker" name="LineageOS/android_packages_apps_ThemePicker" groups="pdk-fs" /> <project path="packages/apps/ThemePicker" name="LineageOS/android_packages_apps_ThemePicker" groups="pdk-fs" />
<project path="packages/apps/Traceur" name="platform/packages/apps/Traceur" groups="pdk-fs" remote="aosp" /> <project path="packages/apps/Traceur" name="platform/packages/apps/Traceur" groups="pdk-fs" remote="aosp" />
<project path="packages/apps/Trebuchet" name="LineageOS/android_packages_apps_Trebuchet" groups="pdk-fs" />
<project path="packages/apps/TvSettings" name="LineageOS/android_packages_apps_TvSettings" groups="pdk-fs" /> <project path="packages/apps/TvSettings" name="LineageOS/android_packages_apps_TvSettings" groups="pdk-fs" />
<project path="packages/apps/TV" name="platform/packages/apps/TV" groups="pdk" remote="aosp" /> <project path="packages/apps/TV" name="platform/packages/apps/TV" groups="pdk" remote="aosp" />
<project path="packages/apps/UniversalMediaPlayer" name="platform/packages/apps/UniversalMediaPlayer" remote="aosp" /> <project path="packages/apps/UniversalMediaPlayer" name="platform/packages/apps/UniversalMediaPlayer" remote="aosp" />

View File

@ -47,7 +47,6 @@
<project path="packages/apps/Seedvault" name="LineageOS/android_packages_apps_Seedvault" /> <project path="packages/apps/Seedvault" name="LineageOS/android_packages_apps_Seedvault" />
<project path="packages/apps/SetupWizard" name="LineageOS/android_packages_apps_SetupWizard" /> <project path="packages/apps/SetupWizard" name="LineageOS/android_packages_apps_SetupWizard" />
<project path="packages/apps/SimpleDeviceConfig" name="LineageOS/android_packages_apps_SimpleDeviceConfig" /> <project path="packages/apps/SimpleDeviceConfig" name="LineageOS/android_packages_apps_SimpleDeviceConfig" />
<project path="packages/apps/Trebuchet" name="LineageOS/android_packages_apps_Trebuchet" />
<project path="packages/apps/Updater" name="LineageOS/android_packages_apps_Updater" /> <project path="packages/apps/Updater" name="LineageOS/android_packages_apps_Updater" />
<project path="packages/overlays/Lineage" name="LineageOS/android_packages_overlays_Lineage" /> <project path="packages/overlays/Lineage" name="LineageOS/android_packages_overlays_Lineage" />
<project path="packages/resources/devicesettings" name="LineageOS/android_packages_resources_devicesettings" /> <project path="packages/resources/devicesettings" name="LineageOS/android_packages_resources_devicesettings" />