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

Commit bad77112 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge remote-tracking branch 'origin/lineage-15.1' into v1-oreo

parents 3f922fd3 7349b403
Loading
Loading
Loading
Loading
+6 −7
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@
  <project path="external/kernel-headers" name="platform/external/kernel-headers" groups="pdk" remote="aosp" />
  <project path="external/kmod" name="platform/external/kmod" groups="pdk" remote="aosp" />
  <project path="external/ksoap2" name="platform/external/ksoap2" groups="pdk" remote="aosp" />
  <project path="external/libavc" name="platform/external/libavc" groups="pdk" remote="aosp" />
  <project path="external/libavc" name="LineageOS/android_external_libavc" groups="pdk" />
  <project path="external/libbackup" name="platform/external/libbackup" groups="pdk" remote="aosp" />
  <project path="external/libbrillo" name="platform/external/libbrillo" groups="pdk" remote="aosp" />
  <project path="external/libcap" name="platform/external/libcap" groups="pdk" remote="aosp" />
@@ -198,7 +198,7 @@
  <project path="external/libevent" name="platform/external/libevent" groups="pdk" remote="aosp" />
  <project path="external/libexif" name="platform/external/libexif" groups="pdk" remote="aosp" />
  <project path="external/libgsm" name="platform/external/libgsm" groups="pdk" remote="aosp" />
  <project path="external/libhevc" name="platform/external/libhevc" groups="pdk" remote="aosp" />
  <project path="external/libhevc" name="LineageOS/android_external_libhevc" groups="pdk" />
  <project path="external/libjpeg-turbo" name="platform/external/libjpeg-turbo" groups="pdk" remote="aosp" />
  <project path="external/libldac" name="platform/external/libldac" groups="pdk" remote="aosp" />
  <project path="external/liblzf" name="platform/external/liblzf" groups="pdk" remote="aosp" />
@@ -260,7 +260,6 @@
  <project path="external/oauth" name="platform/external/oauth" groups="pdk" remote="aosp" />
  <project path="external/objenesis" name="platform/external/objenesis" groups="pdk" remote="aosp" />
  <project path="external/okhttp" name="platform/external/okhttp" groups="pdk" remote="aosp" />
  <project path="external/opencv" name="platform/external/opencv" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <project path="external/owasp/sanitizer" name="platform/external/owasp/sanitizer" groups="pdk" remote="aosp" />
  <project path="external/parameter-framework" name="platform/external/parameter-framework" groups="pdk" remote="aosp" />
  <project path="external/pcre" name="platform/external/pcre" groups="pdk" remote="aosp" />
@@ -285,7 +284,7 @@
  <project path="external/selinux" name="LineageOS/android_external_selinux" groups="pdk" />
  <project path="external/sfntly" name="platform/external/sfntly" groups="pdk,qcom_msm8x26" remote="aosp" />
  <project path="external/shflags" name="platform/external/shflags" groups="pdk" remote="aosp" />
  <project path="external/skia" name="platform/external/skia" groups="pdk,qcom_msm8x26" remote="aosp" />
  <project path="external/skia" name="LineageOS/android_external_skia" groups="pdk,qcom_msm8x26" />
  <project path="external/sl4a" name="platform/external/sl4a" groups="pdk" remote="aosp" />
  <project path="external/slf4j" name="platform/external/slf4j" groups="pdk" remote="aosp" />
  <project path="external/smali" name="platform/external/smali" groups="pdk" remote="aosp" />
@@ -294,7 +293,7 @@
  <project path="external/sonivox" name="platform/external/sonivox" groups="pdk" remote="aosp" />
  <project path="external/speex" name="platform/external/speex" groups="pdk" remote="aosp" />
  <project path="external/spirv-llvm" name="platform/external/spirv-llvm" groups="pdk" remote="aosp" />
  <project path="external/sqlite" name="platform/external/sqlite" groups="pdk" remote="aosp" />
  <project path="external/sqlite" name="LineageOS/android_external_sqlite" groups="pdk" />
  <project path="external/squashfs-tools" name="platform/external/squashfs-tools" groups="pdk" remote="aosp" />
  <project path="external/strace" name="platform/external/strace" groups="pdk" remote="aosp" />
  <project path="external/stressapptest" name="platform/external/stressapptest" groups="pdk" remote="aosp" />
@@ -528,11 +527,11 @@
  <project path="system/extras" name="LineageOS/android_system_extras" groups="pdk" />
  <project path="system/gatekeeper" name="platform/system/gatekeeper" groups="pdk" remote="aosp" />
  <project path="system/hardware/interfaces" name="platform/system/hardware/interfaces" groups="pdk" remote="aosp" />
  <project path="system/hwservicemanager" name="platform/system/hwservicemanager" groups="pdk" remote="aosp" />
  <project path="system/hwservicemanager" name="LineageOS/android_system_hwservicemanager" groups="pdk" />
  <project path="system/keymaster" name="platform/system/keymaster" groups="pdk" remote="aosp" />
  <project path="system/libfmq" name="platform/system/libfmq" groups="pdk" remote="aosp" />
  <project path="system/libhidl" name="LineageOS/android_system_libhidl" groups="pdk" />
  <project path="system/libhwbinder" name="platform/system/libhwbinder" groups="pdk" remote="aosp" />
  <project path="system/libhwbinder" name="LineageOS/android_system_libhwbinder" groups="pdk" />
  <project path="system/libufdt" name="platform/system/libufdt" groups="pdk" remote="aosp" />
  <project path="system/libvintf" name="platform/system/libvintf" groups="pdk" remote="aosp" />
  <project path="system/media" name="platform/system/media" groups="pdk" remote="aosp" />