Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7f8f6ec authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch 'v1-t' into v1-t-vcard

parents 36f482bd cdf9309a
Loading
Loading
Loading
Loading
+19 −18
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@
  <remote  name="aosp"
           fetch="https://android.googlesource.com"
           review="android-review.googlesource.com"
           revision="refs/tags/android-13.0.0_r43" />
           revision="refs/tags/android-13.0.0_r75" />

  <remote  name="e"
           fetch="https://gitlab.e.foundation"
@@ -26,7 +26,7 @@
           sync-c="true"
           sync-j="4" />

  <superproject name="platform/superproject" remote="aosp" revision="android-13.0.0_r43" />
  <superproject name="platform/superproject" remote="aosp" revision="android-13.0.0_r75" />
  <contactinfo bugurl="go/repo-bug" />

  <!-- AOSP Projects -->
@@ -58,7 +58,7 @@
  <project path="cts" name="platform/cts" groups="cts,pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="dalvik" name="platform/dalvik" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="developers/build" name="platform/developers/build" groups="developers,pdk" remote="aosp" />
  <project path="development" name="platform/development" groups="developers,pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="development" name="LineageOS/android_development" groups="developers,pdk-cw-fs,pdk-fs" />
  <project path="device/common" name="device/common" groups="pdk-cw-fs,pdk" remote="aosp" />
  <project path="device/generic/arm64" name="device/generic/arm64" groups="pdk" remote="aosp" />
  <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" groups="pdk" remote="aosp" />
@@ -78,7 +78,7 @@
  <project path="device/generic/x86_64" name="device/generic/x86_64" groups="pdk" remote="aosp" />
  <project path="device/generic/vulkan-cereal" name="device/generic/vulkan-cereal" groups="pdk" remote="aosp" />
  <project path="device/google/atv" name="LineageOS/android_device_google_atv" groups="device,broadcom_pdk,generic_fs,pdk" />
  <project path="device/google/contexthub" name="device/google/contexthub" groups="device,pdk" remote="aosp" />
  <project path="device/google/contexthub" name="LineageOS/android_device_google_contexthub" groups="device,pdk" />
  <project path="device/google/cuttlefish" name="device/google/cuttlefish" groups="device,pdk" remote="aosp" />
  <project path="device/google/cuttlefish_prebuilts" name="device/google/cuttlefish_prebuilts" groups="device,pdk" clone-depth="1" remote="aosp" />
  <project path="device/google/gs-common" name="device/google/gs-common" groups="device,slider,bluejay,pdk-gs-arm" remote="aosp" />
@@ -151,7 +151,7 @@
  <project path="external/dokka" name="platform/external/dokka" groups="pdk" remote="aosp" />
  <project path="external/downloader" name="platform/external/downloader" groups="pdk" remote="aosp" />
  <project path="external/drm_hwcomposer" name="platform/external/drm_hwcomposer" groups="drm_hwcomposer,pdk-fs" remote="aosp" />
  <project path="external/dtc" name="platform/external/dtc" groups="pdk" remote="aosp" />
  <project path="external/dtc" name="LineageOS/android_external_dtc" groups="pdk" />
  <project path="external/dynamic_depth" name="platform/external/dynamic_depth" groups="pdk" remote="aosp" />
  <project path="external/e2fsprogs" name="LineageOS/android_external_e2fsprogs" groups="pdk" />
  <project path="external/easymock" name="platform/external/easymock" groups="pdk" remote="aosp" />
@@ -308,12 +308,12 @@
  <project path="external/liburing" name="platform/external/liburing" groups="pdk" remote="aosp" />
  <project path="external/libusb" name="platform/external/libusb" groups="pdk" remote="aosp" />
  <project path="external/libutf" name="platform/external/libutf" groups="pdk" remote="aosp" />
  <project path="external/libvpx" name="platform/external/libvpx" groups="pdk" remote="aosp" />
  <project path="external/libvpx" name="LineageOS/android_external_libvpx" groups="pdk" />
  <project path="external/libwebm" name="platform/external/libwebm" groups="pdk" remote="aosp" />
  <project path="external/libwebsockets" name="platform/external/libwebsockets" groups="pdk" remote="aosp" />
  <project path="external/libxaac" name="platform/external/libxaac" groups="pdk" remote="aosp" />
  <project path="external/libxkbcommon" name="platform/external/libxkbcommon" groups="pdk" remote="aosp" />
  <project path="external/libxml2" name="platform/external/libxml2" groups="pdk,libxml2" remote="aosp" />
  <project path="external/libxml2" name="LineageOS/android_external_libxml2" groups="pdk,libxml2" />
  <project path="external/libyuv" name="platform/external/libyuv" groups="pdk,libyuv" remote="aosp" />
  <project path="external/linux-kselftest" name="platform/external/linux-kselftest" groups="vts,pdk" clone-depth="1" remote="aosp" />
  <project path="external/llvm" name="platform/external/llvm" groups="pdk" remote="aosp" />
@@ -710,7 +710,7 @@
  <project path="external/walt" name="platform/external/walt" groups="pdk" remote="aosp" />
  <project path="external/wayland" name="platform/external/wayland" groups="pdk" remote="aosp" />
  <project path="external/wayland-protocols" name="platform/external/wayland-protocols" groups="pdk" remote="aosp" />
  <project path="external/webp" name="platform/external/webp" groups="pdk,qcom_msm8x26" remote="aosp" />
  <project path="external/webp" name="LineageOS/android_external_webp" groups="pdk,qcom_msm8x26" />
  <project path="external/webrtc" name="platform/external/webrtc" groups="pdk" remote="aosp" />
  <project path="external/wpa_supplicant_8" name="LineageOS/android_external_wpa_supplicant_8" groups="pdk" />
  <project path="external/wmediumd" name="platform/external/wmediumd" groups="pdk" remote="aosp" />
@@ -747,7 +747,7 @@
  <project path="frameworks/opt/car/services" name="platform/frameworks/opt/car/services" groups="pdk-fs" remote="aosp" />
  <project path="frameworks/opt/car/setupwizard" name="platform/frameworks/opt/car/setupwizard" groups="pdk" remote="aosp" />
  <project path="frameworks/opt/chips" name="platform/frameworks/opt/chips" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="frameworks/opt/colorpicker" name="platform/frameworks/opt/colorpicker" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="frameworks/opt/colorpicker" name="LineageOS/android_frameworks_opt_colorpicker" groups="pdk-cw-fs,pdk-fs" />
  <project path="frameworks/opt/localepicker" name="platform/frameworks/opt/localepicker" remote="aosp" />
  <project path="frameworks/opt/net/ethernet" name="platform/frameworks/opt/net/ethernet" groups="pdk-fs" remote="aosp" />
  <project path="frameworks/opt/net/ims" name="platform/frameworks/opt/net/ims" groups="frameworks_ims,pdk-cw-fs,pdk-fs" remote="aosp" />
@@ -762,7 +762,7 @@
  <project path="frameworks/proto_logging" name="platform/frameworks/proto_logging" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="frameworks/rs" name="platform/frameworks/rs" groups="pdk" remote="aosp" />
  <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="hardware/broadcom/libbt" name="platform/hardware/broadcom/libbt" groups="pdk" remote="aosp" />
  <project path="hardware/broadcom/libbt" name="LineageOS/android_hardware_broadcom_libbt" groups="pdk" />
  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" groups="pdk,broadcom_wlan" remote="aosp" />
  <project path="hardware/google/apf" name="platform/hardware/google/apf" groups="pdk" remote="aosp" />
  <project path="hardware/google/av" name="platform/hardware/google/av" groups="pdk" remote="aosp" />
@@ -779,7 +779,7 @@
  <project path="hardware/invensense" name="platform/hardware/invensense" groups="invensense,pdk" remote="aosp" />
  <project path="hardware/knowles/athletico/sound_trigger_hal" name="platform/hardware/knowles/athletico/sound_trigger_hal" groups="coral,generic_fs" remote="aosp" />
  <project path="hardware/libhardware" name="LineageOS/android_hardware_libhardware" groups="pdk" />
  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" groups="pdk" remote="aosp" />
  <project path="hardware/libhardware_legacy" name="LineageOS/android_hardware_libhardware_legacy" groups="pdk" />
  <project path="hardware/nxp/nfc" name="platform/hardware/nxp/nfc" groups="pdk" remote="aosp" />
  <project path="hardware/nxp/secure_element" name="platform/hardware/nxp/secure_element" groups="pdk" remote="aosp" />
  <project path="hardware/qcom/audio" name="LineageOS/android_hardware_qcom_audio" groups="qcom,qcom_audio,pdk-qcom" />
@@ -822,6 +822,7 @@
  <project path="hardware/st/nfc" name="platform/hardware/st/nfc" groups="pdk" remote="aosp" />
  <project path="hardware/st/secure_element" name="platform/hardware/st/secure_element" groups="pdk" remote="aosp" />
  <project path="hardware/st/secure_element2" name="platform/hardware/st/secure_element2" groups="pdk" remote="aosp" />
  <project path="hardware/synaptics/wlan" name="platform/hardware/synaptics/wlan" groups="pdk" remote="aosp" />
  <project path="hardware/ti/am57x" name="platform/hardware/ti/am57x" groups="pdk" remote="aosp" />
  <project path="kernel/configs" name="LineageOS/android_kernel_configs" groups="vts,pdk" />
  <project path="kernel/prebuilts/4.19/arm64" name="kernel/prebuilts/4.19/arm64" groups="pdk" clone-depth="1" remote="aosp" />
@@ -878,7 +879,7 @@
  <project path="packages/apps/EmergencyInfo" name="LineageOS/android_packages_apps_EmergencyInfo" groups="pdk-fs" />
  <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" groups="pdk-fs" remote="aosp" />
  <project path="packages/apps/ImsServiceEntitlement" name="platform/packages/apps/ImsServiceEntitlement" groups="pdk-fs" remote="aosp" />
  <project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" groups="pdk-fs" remote="aosp" />
  <project path="packages/apps/KeyChain" name="LineageOS/android_packages_apps_KeyChain" groups="pdk-fs" />
  <project path="packages/apps/ManagedProvisioning" name="platform/packages/apps/ManagedProvisioning" groups="pdk-fs" remote="aosp" />
  <project path="packages/apps/Messaging" name="LineageOS/android_packages_apps_Messaging" groups="pdk-fs" />
  <project path="packages/apps/Music" name="platform/packages/apps/Music" groups="pdk-fs" remote="aosp" />
@@ -924,7 +925,7 @@
  <project path="packages/modules/CellBroadcastService" name="platform/packages/modules/CellBroadcastService" groups="pdk" remote="aosp" />
  <project path="packages/modules/common" name="LineageOS/android_packages_modules_common" groups="pdk-cw-fs,pdk-fs" />
  <project path="packages/modules/Connectivity" name="LineageOS/android_packages_modules_Connectivity" groups="pdk-cw-fs,pdk-fs" />
  <project path="packages/modules/DnsResolver" name="platform/packages/modules/DnsResolver" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="packages/modules/DnsResolver" name="LineageOS/android_packages_modules_DnsResolver" groups="pdk-cw-fs,pdk-fs" />
  <project path="packages/modules/ExtServices" name="platform/packages/modules/ExtServices" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="packages/modules/GeoTZ" name="platform/packages/modules/GeoTZ" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="packages/modules/Gki" name="platform/packages/modules/Gki" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
@@ -934,14 +935,14 @@
  <project path="packages/modules/ModuleMetadata" name="platform/packages/modules/ModuleMetadata" groups="pdk" remote="aosp" />
  <project path="packages/modules/NetworkPermissionConfig" name="platform/packages/modules/NetworkPermissionConfig" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="packages/modules/NetworkStack" name="platform/packages/modules/NetworkStack" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="packages/modules/NeuralNetworks" name="platform/packages/modules/NeuralNetworks" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="packages/modules/NeuralNetworks" name="LineageOS/android_packages_modules_NeuralNetworks" groups="pdk-cw-fs,pdk-fs" />
  <project path="packages/modules/OnDevicePersonalization" name="platform/packages/modules/OnDevicePersonalization" groups="pdk-fs" remote="aosp" />
  <project path="packages/modules/Permission" name="LineageOS/android_packages_modules_Permission" groups="pdk-cw-fs,pdk-fs" />
  <project path="packages/modules/RuntimeI18n" name="platform/packages/modules/RuntimeI18n" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="packages/modules/Scheduling" name="platform/packages/modules/Scheduling" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="packages/modules/SEPolicy" name="platform/packages/modules/SEPolicy" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="packages/modules/SdkExtensions" name="platform/packages/modules/SdkExtensions" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="packages/modules/StatsD" name="platform/packages/modules/StatsD" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="packages/modules/StatsD" name="LineageOS/android_packages_modules_StatsD" groups="pdk-cw-fs,pdk-fs" />
  <project path="packages/modules/TestModule" name="platform/packages/modules/TestModule" remote="aosp" />
  <project path="packages/modules/Uwb" name="platform/packages/modules/Uwb" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="packages/modules/Virtualization" name="LineageOS/android_packages_modules_Virtualization" groups="pdk" />
@@ -1035,7 +1036,7 @@
  <project path="system/apex" name="LineageOS/android_system_apex" groups="pdk" />
  <project path="system/bpf" name="platform/system/bpf" groups="pdk" remote="aosp" />
  <project path="system/bpfprogs" name="platform/system/bpfprogs" groups="pdk" remote="aosp" />
  <project path="system/ca-certificates" name="platform/system/ca-certificates" groups="pdk" remote="aosp" />
  <project path="system/ca-certificates" name="LineageOS/android_system_ca-certificates" groups="pdk" />
  <project path="system/chre" name="platform/system/chre" groups="pdk" remote="aosp" />
  <project path="system/connectivity/wificond" name="platform/system/connectivity/wificond" groups="pdk" remote="aosp" />
  <project path="system/core" name="LineageOS/android_system_core" groups="pdk" />
@@ -1068,7 +1069,7 @@
  <project path="system/memory/libmemtrack" name="platform/system/memory/libmemtrack" groups="pdk" remote="aosp" />
  <project path="system/memory/libmemunreachable" name="platform/system/memory/libmemunreachable" groups="pdk" remote="aosp" />
  <project path="system/memory/lmkd" name="LineageOS/android_system_memory_lmkd" groups="pdk" />
  <project path="system/netd" name="platform/system/netd" groups="pdk" remote="aosp" />
  <project path="system/netd" name="LineageOS/android_system_netd" groups="pdk" />
  <project path="system/nfc" name="platform/system/nfc" groups="pdk" remote="aosp" />
  <project path="system/nvram" name="platform/system/nvram" groups="pdk" remote="aosp" />
  <project path="system/security" name="LineageOS/android_system_security" groups="pdk" />
@@ -1107,7 +1108,7 @@
  <project path="tools/acloud" name="platform/tools/acloud" groups="tools,vts,projectarch,pdk,tradefed" remote="aosp" />
  <project path="tools/adt/idea" name="platform/tools/adt/idea" groups="notdefault,tools" remote="aosp" />
  <project path="tools/apifinder" name="platform/tools/apifinder" groups="pdk,tools" remote="aosp" />
  <project path="tools/apksig" name="platform/tools/apksig" groups="pdk,tradefed" remote="aosp" />
  <project path="tools/apksig" name="LineageOS/android_tools_apksig" groups="pdk,tradefed" />
  <project path="tools/apkzlib" name="platform/tools/apkzlib" groups="pdk,tradefed" remote="aosp" />
  <project path="tools/asuite" name="platform/tools/asuite" groups="pdk" remote="aosp" />
  <project path="tools/base" name="platform/tools/base" groups="notdefault,tools" remote="aosp" />
+10 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@
  <remove-project path="bootable/recovery" name="LineageOS/android_bootable_recovery" groups="pdk" />
  <remove-project path="device/lineage/sepolicy" name="LineageOS/android_device_lineage_sepolicy" />
  <remove-project path="frameworks/base" name="LineageOS/android_frameworks_base" groups="pdk-cw-fs,pdk-fs" />
  <remove-project path="frameworks/libs/net" name="platform/frameworks/libs/net" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <remove-project path="hardware/interfaces" name="LineageOS/android_hardware_interfaces" groups="pdk" />
  <remove-project path="lineage-sdk" name="LineageOS/android_lineage-sdk" />
  <remove-project path="packages/apps/Backgrounds" name="LineageOS/android_packages_apps_Backgrounds" />
  <remove-project path="packages/apps/Contacts" name="LineageOS/android_packages_apps_Contacts" groups="pdk-fs" />
@@ -26,8 +28,11 @@
  <remove-project path="packages/apps/Updater" name="LineageOS/android_packages_apps_Updater" />
  <remove-project path="packages/apps/WallpaperPicker2" name="LineageOS/android_packages_apps_WallpaperPicker2" groups="pdk-fs" />
  <remove-project path="packages/inputmethods/LatinIME" name="LineageOS/android_packages_inputmethods_LatinIME" groups="pdk-fs" />
  <remove-project path="packages/modules/Connectivity" name="LineageOS/android_packages_modules_Connectivity" groups="pdk-fs" />
  <remove-project path="packages/modules/DnsResolver" name="platform/packages/modules/DnsResolver" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <remove-project path="packages/modules/Permission" name="LineageOS/android_packages_modules_Permission" groups="pdk-cw-fs,pdk-fs" />
  <remove-project path="packages/providers/MediaProvider" name="LineageOS/android_packages_providers_MediaProvider" groups="pdk-cw-fs,pdk-fs" />
  <remove-project path="packages/services/Telephony" name="LineageOS/android_packages_services_Telephony" groups="pdk-cw-fs,pdk-fs" />
  <remove-project path="vendor/lineage" name="LineageOS/android_vendor_lineage" />
  <remove-project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" groups="pdk-cw-fs,pdk-fs" />

@@ -44,6 +49,8 @@
  <project path="bootable/recovery" name="e/os/android_bootable_recovery" groups="pdk" remote="e" />
  <project path="device/lineage/sepolicy" name="e/os/android_device_lineage_sepolicy" remote="e" />
  <project path="frameworks/base" name="e/os/android_frameworks_base" groups="pdk-cw-fs,pdk-fs" remote="e" />
  <project path="frameworks/libs/net" name="e/os/android_frameworks_libs_net" groups="pdk-cw-fs,pdk-fs" remote="e" />
  <project path="hardware/interfaces" name="e/os/android_hardware_interfaces" groups="pdk" remote="e" />
  <project path="lineage-sdk" name="e/os/android_lineage-sdk" remote="e" />
  <project path="packages/apps/Backgrounds" name="e/os/android_packages_apps_Backgrounds" remote="e" />
  <project path="packages/apps/Contacts" name="e/os/android_packages_apps_Contacts" groups="pdk-fs" remote="e" />
@@ -64,8 +71,11 @@
  <project path="packages/apps/Updater" name="e/os/android_packages_apps_Updater" remote="e" />
  <project path="packages/apps/WallpaperPicker2" name="e/os/android_packages_apps_WallpaperPicker2" groups="pdk-fs" remote="e" />
  <project path="packages/inputmethods/LatinIME" name="e/os/android_packages_inputmethods_LatinIME" groups="pdk-fs" remote="e"/>
  <project path="packages/modules/Connectivity" name="e/os/android_packages_modules_Connectivity" groups="pdk-cw-fs,pdk-fs" remote="e" />
  <project path="packages/modules/DnsResolver" name="e/os/android_packages_modules_DnsResolver" groups="pdk-cw-fs,pdk-fs" remote="e" />
  <project path="packages/modules/Permission" name="e/os/android_packages_modules_Permission" groups="pdk-cw-fs,pdk-fs" remote="e" />
  <project path="packages/providers/MediaProvider" name="e/os/android_packages_providers_MediaProvider" groups="pdk-cw-fs,pdk-fs" remote="e" />
  <project path="packages/services/Telephony" name="e/os/android_packages_services_Telephony" groups="pdk-cw-fs,pdk-fs" remote="e" />
  <project path="vendor/lineage" name="e/os/android_vendor_lineage" remote="e" />

  <!-- ih8sn -->
+30 −18

File changed.

Preview size limit exceeded, changes collapsed.

+36 −43

File changed.

Preview size limit exceeded, changes collapsed.