From 6814243b9db077191dd8f08c59b4772f8717672f Mon Sep 17 00:00:00 2001
From: Menno van Grinsven <scanno71@gmail.com>
Date: Sun, 1 Jul 2018 16:29:10 +0200
Subject: [PATCH 1/3] android: Add gitlab as predefined remote source

Change-Id: If71a3ac1cd82eb7360ce1ce86d185e7570f31acd
---
 omni-aosp.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/omni-aosp.xml b/omni-aosp.xml
index be6ec06..9ab6cb5 100644
--- a/omni-aosp.xml
+++ b/omni-aosp.xml
@@ -4,6 +4,9 @@
   <remote  name="github"
            fetch="https://github.com/" />
 
+  <remote  name="gitlab"
+           fetch="https://gitlab.com/" />
+
   <remote  name="omnirom"
            fetch="https://github.com/omnirom"
            review="gerrit.omnirom.org" />
@@ -29,7 +32,7 @@
   <project path="external/aac" name="android_external_aac" remote="omnirom" revision="android-8.1" />
   <project path="external/chromium-webview" name="android_external_chromium-webview" remote="omnirom" revision="android-8.1" />
   <project path="external/e2fsprogs" name="android_external_e2fsprogs" remote="omnirom" revision="android-8.1" />
-  <project path="external/f2fs-tools" name="android_external_f2fs-tools" remote="omnirom" revision="android-8.1" />  
+  <project path="external/f2fs-tools" name="android_external_f2fs-tools" remote="omnirom" revision="android-8.1" />
   <project path="external/mksh" name="android_external_mksh" remote="omnirom" revision="android-8.1" />
   <project path="external/tinycompress" name="android_external_tinycompress" remote="omnirom" revision="android-8.1" />
   <project path="external/selinux" name="android_external_selinux" remote="omnirom" revision="android-8.1" />

From 89b68a35920a65a9dd470bbfa4b21e179abef8b1 Mon Sep 17 00:00:00 2001
From: darkobas <darkobas@gmail.com>
Date: Thu, 5 Jul 2018 16:59:57 +0200
Subject: [PATCH 2/3] manifest: use forked art

Change-Id: I4d6f5e9dfee4ed3714d1e40fd93b0d17c9ac5590
---
 omni-aosp.xml | 1 +
 remove.xml    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/omni-aosp.xml b/omni-aosp.xml
index be6ec06..d144188 100644
--- a/omni-aosp.xml
+++ b/omni-aosp.xml
@@ -8,6 +8,7 @@
            fetch="https://github.com/omnirom"
            review="gerrit.omnirom.org" />
 
+  <project path="art" name="android_art" remote="omnirom" revision="android-8.1" groups="pdk" />
   <project path="bionic" name="android_bionic" remote="omnirom" revision="android-8.1" groups="pdk" />
 
   <project path="build/make" name="android_build" remote="omnirom" revision="android-8.1" groups="pdk" >
diff --git a/remove.xml b/remove.xml
index bbf65ad..4d77c49 100644
--- a/remove.xml
+++ b/remove.xml
@@ -8,6 +8,7 @@
   <remove-project name="device/google/wahoo" />
   <remove-project name="device/google/wahoo-kernel" />
 
+  <remove-project name="platform/art" />
   <remove-project name="platform/bionic" />
   <remove-project name="platform/build" />
   <remove-project name="platform/build/soong" />

From 829ab1c1d42ea107ec99759dca00dc92feee4bf6 Mon Sep 17 00:00:00 2001
From: darkobas <darkobas@gmail.com>
Date: Fri, 6 Jul 2018 08:24:28 +0000
Subject: [PATCH 3/3] manifest: android-8.1_r40

Change-Id: I05c63d0b321bcbfae1dcab6ccf33ce371b6905dc
---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index eadb8b6..cecec1d 100644
--- a/default.xml
+++ b/default.xml
@@ -3,7 +3,7 @@
   <remote  name="aosp"
            fetch="https://android.googlesource.com"
            review="https://android-review.googlesource.com/" />
-  <default revision="refs/tags/android-8.1.0_r32"
+  <default revision="refs/tags/android-8.1.0_r40"
            remote="aosp"
            sync-c="true"
            sync-j="12" />