Update paths for Bluez and Mesa

- Bluez now shares the same repository as AOSP
- Mesa path was incomplete

diff --git a/cm.xml b/cm.xml
index 9a4de5e..3a87bd0 100644 (file)
--- a/cm.xml
+++ b/cm.xml
@@ -27,6 +27,7 @@
   <project path="device/generic/firmware" name="device/generic/firmware" remote="x86" revision="marshmallow-x86" />
   <project path="external/alsa-lib" name="platform/external/alsa-lib" remote="x86" revision="marshmallow-x86" />
   <project path="external/alsa-utils" name="platform/external/alsa-utils" remote="x86" revision="marshmallow-x86" />
+  <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" remote="x86" revision="marshmallow-x86" />
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" remote="x86" revision="marshmallow-x86" />
   <project path="external/bluetooth/sbc" name="platform/external/bluetooth/sbc" remote="x86" revision="marshmallow-x86" />
   <project path="external/busybox" name="platform/external/busybox" remote="x86" revision="marshmallow-x86" />
@@ -34,7 +35,7 @@
   <project path="external/drm_hwcomposer" name="platform/external/drm_hwcomposer" groups="drm_hwcomposer" remote="x86" revision="marshmallow-x86" />
   <project path="external/libpciaccess" name="platform/external/libpciaccess" remote="x86" revision="marshmallow-x86" />
   <project path="external/libdrm" name="platform/external/libdrm" remote="x86" revision="marshmallow-x86" />
-  <project path="external/mesa" name="mesa" remote="x86" revision="marshmallow-x86" />
+  <project path="external/mesa" name="platform/external/mesa" remote="x86" revision="marshmallow-x86" />
   <project path="external/v86d" name="platform/external/v86d" remote="x86" revision="marshmallow-x86" />
   <project path="hardware/gps" name="platform/hardware/gps" remote="x86" revision="marshmallow-x86" />
   <project path="hardware/intel/libsensors" name="platform/hardware/intel/libsensors" remote="x86" revision="marshmallow-x86"/>
@@ -53,7 +54,6 @@
   <project path="device/generic/common" name="device/generic/common" groups="pdk" remote="x86" revision="cm-13.0-x86" />
   <project path="device/generic/android_x86" name="device/generic/x86" groups="pdk" remote="x86" revision="cm13" />
   <project path="device/generic/android_x86_64" name="device/generic/x86_64" groups="pdk" remote="x86" revision="cm13" />
-  <project path="external/bluetooth/bluez" name="android_external_bluetooth_bluez" remote="meijjaa" />
   <project path="frameworks/av" name="android_frameworks_av" remote="meijjaa" />
   <project path="frameworks/base" name="android_frameworks_base" remote="meijjaa" />
   <project path="frameworks/native" name="android_frameworks_native" remote="meijjaa" />