manifest: bring back omnirom repos

hardware/qcom/audio
hardware/qcom/display
hardware/qcom/media
system/core
system/sepolicy
system/vold

omni-caf.xml

Change-Id: I165048603b2e6ef188407714971b4ce342fa00fa
diff --git a/omni-aosp.xml b/omni-aosp.xml
index 5db87ec..fbd6676 100644
--- a/omni-aosp.xml
+++ b/omni-aosp.xml
@@ -19,9 +19,17 @@
   </project>
   <project path="build/soong" name="android_build_soong" remote="omnirom" revision="android-8.0" />
 
+  <project path="hardware/qcom/audio" name="android_hardware_qcom_audio" remote="omnirom" revision="android-8.0" />
+  <project path="hardware/qcom/display" name="android_hardware_qcom_display" remote="omnirom" revision="android-8.0" />
+  <project path="hardware/qcom/media" name="android_hardware_qcom_media" 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" />
+
+  <project path="system/core" name="android_system_core" remote="omnirom" revision="android-8.0" />
+  <project path="system/sepolicy" name="android_system_sepolicy" remote="omnirom" revision="android-8.0" />
+  <project path="system/vold" name="android_system_vold" remote="omnirom" revision="android-8.0" />
 </manifest>
diff --git a/omni-caf.xml b/omni-caf.xml
new file mode 100644
index 0000000..0c05283
--- /dev/null
+++ b/omni-caf.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+
+  <remote  name="github"
+           fetch="https://github.com/" />
+
+  <remote  name="omnirom"
+           fetch="https://github.com/omnirom"
+           review="gerrit.omnirom.org" />
+
+  <project path="vendor/codeaurora/telephony" name="android_vendor_codeaurora_telephony" remote="omnirom" revision="android-7.1" />
+</manifest>
diff --git a/omni-default.xml b/omni-default.xml
index 8f3ad23..f443ef2 100644
--- a/omni-default.xml
+++ b/omni-default.xml
@@ -7,6 +7,9 @@
   <!-- Include forked AOSP -->
   <include name="omni-aosp.xml" />
 
+  <!-- Include forked CAF -->
+  <include name="omni-caf.xml" />
+
   <!-- OmniROM Projects -->
   <project path="android" name="android" remote="omnirom" revision="android-8.0" />
 
diff --git a/remove.xml b/remove.xml
index 215f5c0..827fddf 100644
--- a/remove.xml
+++ b/remove.xml
@@ -66,6 +66,10 @@
   <remove-project name="platform/hardware/intel/img/psb_headers" />
   <remove-project name="platform/hardware/intel/img/psb_video" />
   <remove-project name="platform/hardware/intel/sensors" />
+  <remove-project name="platform/hardware/qcom/audio" />
+  <remove-project name="platform/hardware/qcom/display" />
+  <remove-project name="platform/hardware/qcom/gps" />
+  <remove-project name="platform/hardware/qcom/media" />
 
   <remove-project name="kernel/tests" />
 
@@ -79,4 +83,7 @@
   <remove-project name="platform/packages/apps/MusicFX" />
   <remove-project name="platform/packages/apps/Settings" />
 
+  <remove-project name="platform/system/core" />
+  <remove-project name="platform/system/sepolicy" />
+  <remove-project name="platform/system/vold" />
 </manifest>