Merge "Revert "manifest: add omni system/connectivity/wificond/"" into android-8.0
diff --git a/omni-aosp.xml b/omni-aosp.xml
index cfdfa3f..749d897 100644
--- a/omni-aosp.xml
+++ b/omni-aosp.xml
@@ -26,6 +26,7 @@
<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" />
@@ -34,6 +35,7 @@
<project path="frameworks/native" name="android_frameworks_native" remote="omnirom" revision="android-8.0" />
<project path="frameworks/opt/telephony" name="android_frameworks_opt_telephony" remote="omnirom" revision="android-8.0" />
+ <project path="hardware/interfaces" name="android_hardware_interfaces" remote="omnirom" revision="android-8.0" />
<project path="hardware/invensense" name="android_hardware_invensense" remote="omnirom" revision="android-8.0" />
<project path="hardware/libhardware" name="android_hardware_libhardware" remote="omnirom" revision="android-8.0" />
<project path="hardware/qcom/audio" name="android_hardware_qcom_audio" remote="omnirom" revision="android-8.0" />
@@ -54,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/remove.xml b/remove.xml
index 494f5f6..0a16adf 100644
--- a/remove.xml
+++ b/remove.xml
@@ -53,6 +53,7 @@
<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" />
@@ -79,6 +80,7 @@
<remove-project name="platform/hardware/intel/img/psb_video" />
<remove-project name="platform/hardware/intel/sensors" />
<remove-project name="platform/hardware/invensense" />
+ <remove-project name="platform/hardware/interfaces" />
<remove-project name="platform/hardware/libhardware" />
<remove-project name="platform/hardware/qcom/audio" />
<remove-project name="platform/hardware/qcom/bt" />
@@ -106,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>