From 6706d10c5558635161966789e2e8284723ff5839 Mon Sep 17 00:00:00 2001
From: Alexander Martinz <alex@amartinz.at>
Date: Tue, 17 Aug 2021 00:23:55 +0200
Subject: [PATCH] snippets: ubports: track bootable/recovery and external/gpg

Use the ubports recovery instead of the straight lineage-19.1 fork
and add external/gpg to get a static gpg binary, which is used
by the recovery to verify system updates.

Change-Id: I845a2f91d75581eeb55d4e956ee6ebf6873ac5ab
Signed-off-by: Alexander Martinz <alex@amartinz.at>
---
 default.xml          | 3 +++
 snippets/ubports.xml | 5 +++++
 2 files changed, 8 insertions(+)
 create mode 100644 snippets/ubports.xml

diff --git a/default.xml b/default.xml
index 447d0a5..3ca9962 100644
--- a/default.xml
+++ b/default.xml
@@ -45,7 +45,9 @@
   </project>
   <project path="art" name="platform/art" groups="pdk" remote="aosp" />
   <project path="bionic" name="LineageOS/android_bionic" groups="pdk" />
+<!--
   <project path="bootable/recovery" name="LineageOS/android_bootable_recovery" groups="pdk" />
+-->
   <project path="bootable/libbootloader" name="platform/bootable/libbootloader" groups="vts,pdk" remote="aosp" />
   <project path="compatibility/cdd" name="platform/compatibility/cdd" groups="pdk" remote="aosp" />
   <project path="cts" name="platform/cts" groups="cts,pdk-cw-fs,pdk-fs" remote="aosp" />
@@ -1051,6 +1053,7 @@
   <include name="snippets/lineage.xml" />
   <include name="snippets/pixel.xml" />
   <include name="snippets/halium.xml" />
+  <include name="snippets/ubports.xml" />
 
   <repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />
 </manifest>
diff --git a/snippets/ubports.xml b/snippets/ubports.xml
new file mode 100644
index 0000000..9fc50a9
--- /dev/null
+++ b/snippets/ubports.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <project path="bootable/recovery" name="ubports/halium_bootable_recovery" revision="halium-12.0" />
+  <project path="external/gpg" name="ubports/android_external_gpg" revision="halium-10.0" />
+</manifest>