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

Commit 3adf2092 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'lineage-17.1' into v1-q

parents ed957949 393b9173
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@
  <project path="frameworks/opt/net/ethernet" name="platform/frameworks/opt/net/ethernet" groups="pdk-fs" remote="aosp" />
  <project path="frameworks/opt/net/ike" name="platform/frameworks/opt/net/ike" groups="pdk" remote="aosp" />
  <project path="frameworks/opt/net/ims" name="platform/frameworks/opt/net/ims" groups="frameworks_ims,pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="frameworks/opt/net/voip" name="platform/frameworks/opt/net/voip" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="frameworks/opt/net/voip" name="LineageOS/android_frameworks_opt_net_voip" groups="pdk-cw-fs,pdk-fs" />
  <project path="frameworks/opt/net/wifi" name="LineageOS/android_frameworks_opt_net_wifi" groups="pdk" />
  <project path="frameworks/opt/photoviewer" name="platform/frameworks/opt/photoviewer" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="frameworks/opt/setupwizard" name="platform/frameworks/opt/setupwizard" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
@@ -630,7 +630,7 @@
  <project path="system/hwservicemanager" name="platform/system/hwservicemanager" groups="pdk" remote="aosp" />
  <project path="system/iorap" name="platform/system/iorap" groups="pdk" remote="aosp" />
  <project path="system/keymaster" name="LineageOS/android_system_keymaster" groups="pdk" />
  <project path="system/libfmq" name="platform/system/libfmq" groups="pdk" remote="aosp" />
  <project path="system/libfmq" name="LineageOS/android_system_libfmq" groups="pdk" />
  <project path="system/libhidl" name="platform/system/libhidl" groups="pdk" remote="aosp" />
  <project path="system/libhwbinder" name="platform/system/libhwbinder" groups="pdk" remote="aosp" />
  <project path="system/libsysprop" name="platform/system/libsysprop" groups="pdk" remote="aosp" />