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

Commit b80cb4fd authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge remote-tracking branch 'origin/lineage-19.1' into v1-s

parents 1ded200b d87e6598

default.xml

+1 −1
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ 
  <project path="external/yapf" name="platform/external/yapf" groups="vts,projectarch,pdk" remote="aosp" />

  <project path="external/zlib" name="LineageOS/android_external_zlib" groups="pdk" />

  <project path="external/zopfli" name="platform/external/zopfli" groups="pdk" remote="aosp" />

  <project path="external/zstd" name="platform/external/zstd" groups="pdk" remote="aosp" />

  <project path="external/zstd" name="LineageOS/android_external_zstd" />

  <project path="external/zxing" name="platform/external/zxing" groups="pdk" remote="aosp" />

  <project path="frameworks/av" name="LineageOS/android_frameworks_av" groups="pdk" />

  <project path="frameworks/base" name="LineageOS/android_frameworks_base" groups="pdk-cw-fs,pdk-fs" />

snippets/lineage.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
  <!--<project path="external/pigz" name="LineageOS/android_external_pigz" />-->

  <project path="external/rsync" name="LineageOS/android_external_rsync" />

  <project path="external/tinyxml" name="platform/external/tinyxml" groups="pdk" remote="aosp" revision="refs/tags/android-11.0.0_r46" />

  <!--<project path="external/unrar" name="LineageOS/android_external_unrar" />-->

  <project path="external/unrar" name="LineageOS/android_external_unrar" />

  <project path="external/vim" name="LineageOS/android_external_vim" />

  <!--<project path="external/zip" name="LineageOS/android_external_zip" />-->

  <!--<project path="hardware/broadcom/nfc" name="LineageOS/android_hardware_broadcom_nfc" />-->