From 9ab2f62cd86384c5e3e47fddf1c50237655d6065 Mon Sep 17 00:00:00 2001
From: maxwen <max.weninger@gmail.com>
Date: Wed, 23 Aug 2017 17:27:05 +0200
Subject: [PATCH] manifest: bring back omni flavor apps

Change-Id: Ia0b97d2c3110e8f86174d57ca454683f8334dfb2
---
 omni-aosp.xml    |  6 ++++++
 omni-default.xml |  9 +++++++++
 remove.xml       | 10 ++++++++++
 3 files changed, 25 insertions(+)

diff --git a/omni-aosp.xml b/omni-aosp.xml
index 55aec1b..5db87ec 100644
--- a/omni-aosp.xml
+++ b/omni-aosp.xml
@@ -18,4 +18,10 @@
     <linkfile src="tools" dest="build/tools" />
   </project>
   <project path="build/soong" name="android_build_soong" remote="omnirom" revision="android-8.0" />
+
+  <project path="packages/apps/Calendar" name="android_packages_apps_Calendar" remote="omnirom" revision="android-8.0" />
+  <project path="packages/apps/Launcher3" name="android_packages_apps_Launcher3" remote="omnirom" revision="android-8.0" />
+  <project path="packages/apps/Gallery2" name="android_packages_apps_Gallery2" remote="omnirom" revision="android-8.0" />
+  <project path="packages/apps/MusicFX" name="android_packages_apps_MusicFX" remote="omnirom" revision="android-8.0" />
+  <project path="packages/apps/Settings" name="android_packages_apps_Settings" remote="omnirom" revision="android-8.0" />
 </manifest>
diff --git a/omni-default.xml b/omni-default.xml
index e7ca0ad..8f3ad23 100644
--- a/omni-default.xml
+++ b/omni-default.xml
@@ -12,4 +12,13 @@
 
   <project path="vendor/omni" name="android_vendor_omni" remote="omnirom" revision="android-8.0" />
 
+  <project path="packages/apps/Matlog" name="android_packages_apps_Matlog" remote="omnirom" revision="android-8.0" />
+  <project path="packages/apps/MonthCalendarWidget" name="android_packages_apps_MonthCalendarWidget" remote="omnirom" revision="android-8.0" />
+  <project path="packages/apps/OmniClock" name="android_packages_apps_OmniClock" remote="omnirom" revision="android-8.0" />
+  <project path="packages/apps/OmniGears" name="android_packages_apps_OmniGears" remote="omnirom" revision="android-8.0" />
+  <project path="packages/services/OmniJaws" name="android_packages_services_OmniJaws" remote="omnirom" revision="android-8.0" />
+  <project path="packages/apps/OmniStyle" name="android_packages_apps_OmniStyle" remote="omnirom" revision="android-8.0" />
+  <project path="packages/apps/OmniSwitch" name="android_packages_apps_OmniSwitch" remote="omnirom" revision="android-8.0" />
+  <!--needs rebootCustom(String) <project path="packages/apps/OpenDelta" name="android_packages_apps_OpenDelta" remote="omnirom" revision="android-8.0" />-->
+  <project path="packages/apps/Phonograph" name="android_packages_apps_Phonograph" remote="omnirom" revision="android-8.0" />
 </manifest>
diff --git a/remove.xml b/remove.xml
index d6c51f2..215f5c0 100644
--- a/remove.xml
+++ b/remove.xml
@@ -69,4 +69,14 @@
 
   <remove-project name="kernel/tests" />
 
+  <remove-project name="platform/packages/apps/Calendar" />
+  <remove-project name="platform/packages/apps/DeskClock" />
+  <remove-project name="platform/packages/apps/Gallery" />
+  <remove-project name="platform/packages/apps/Gallery2" />
+  <remove-project name="platform/packages/apps/Launcher2" />
+  <remove-project name="platform/packages/apps/Launcher3" />
+  <remove-project name="platform/packages/apps/Music" />
+  <remove-project name="platform/packages/apps/MusicFX" />
+  <remove-project name="platform/packages/apps/Settings" />
+
 </manifest>