Merge "android: remove qcom interfaces... should be put in dependancies" into android-8.0
diff --git a/omni-aosp.xml b/omni-aosp.xml
index 062af0f..749d897 100644
--- a/omni-aosp.xml
+++ b/omni-aosp.xml
@@ -26,6 +26,10 @@
<project path="development" name="android_development" remote="omnirom" revision="android-8.0" groups="pdk-cw-fs,pdk-fs" />
+ <project path="external/e2fsprogs" name="android_external_e2fsprogs" remote="omnirom" revision="android-8.0" />
+ <project path="external/tinycompress" name="android_external_tinycompress" remote="omnirom" revision="android-8.0" />
+ <project path="external/selinux" name="android_external_selinux" remote="omnirom" revision="android-8.0" />
+
<project path="frameworks/av" name="android_frameworks_av" remote="omnirom" revision="android-8.0" />
<project path="frameworks/base" name="android_frameworks_base" remote="omnirom" revision="android-8.0" />
<project path="frameworks/native" name="android_frameworks_native" remote="omnirom" revision="android-8.0" />
@@ -39,6 +43,7 @@
<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="hardware/qcom/power" name="android_hardware_qcom_power" remote="omnirom" revision="android-8.0" />
+ <project path="hardware/qcom/wlan" name="android_hardware_qcom_wlan" 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" />
@@ -51,6 +56,7 @@
<project path="system/core" name="android_system_core" remote="omnirom" revision="android-8.0" />
<project path="system/media" name="android_system_media" remote="omnirom" revision="android-8.0" />
+ <project path="system/netd" name="android_system_netd" 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-default.xml b/omni-default.xml
index 17799c2..967f897 100644
--- a/omni-default.xml
+++ b/omni-default.xml
@@ -15,6 +15,9 @@
<project path="vendor/omni" name="android_vendor_omni" remote="omnirom" revision="android-8.0" />
+ <project path="external/exfat" name="android_external_exfat" remote="omnirom" revision="android-7.1" />
+ <project path="external/fuse" name="android_external_fuse" remote="omnirom" revision="android-7.1" />
+
<project path="packages/apps/DSPManager" name="android_packages_apps_DSPManager" 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" />
diff --git a/remove.xml b/remove.xml
index b25fe35..0a16adf 100644
--- a/remove.xml
+++ b/remove.xml
@@ -53,8 +53,11 @@
<remove-project name="device/linaro/hikey-kernel" />
<remove-project name="device/sample" />
+ <remove-project name="platform/external/e2fsprogs" />
<remove-project name="platform/external/libnfnetlink" />
<remove-project name="platform/external/libnetfilter_conntrack" />
+ <remove-project name="platform/external/tinycompress" />
+ <remove-project name="platform/external/selinux" />
<remove-project name="platform/frameworks/av" />
<remove-project name="platform/frameworks/base" />
@@ -85,6 +88,7 @@
<remove-project name="platform/hardware/qcom/gps" />
<remove-project name="platform/hardware/qcom/media" />
<remove-project name="platform/hardware/qcom/power" />
+ <remove-project name="platform/hardware/qcom/wlan" />
<remove-project name="platform/hardware/ril" />
<remove-project name="kernel/tests" />
@@ -104,6 +108,7 @@
<remove-project name="platform/system/core" />
<remove-project name="platform/system/media" />
+ <remove-project name="platform/system/netd" />
<remove-project name="platform/system/sepolicy" />
<remove-project name="platform/system/vold" />
</manifest>