cm: use marshmallow-x86 version of external/llvm

[android-x86/manifest.git] / cm.xml

diff --git a/cm.xml b/cm.xml
index a210a89..a16577f 100644 (file)
--- a/cm.xml
+++ b/cm.xml
@@ -4,7 +4,7 @@
   <remote  name="aosp"
            fetch="https://android.googlesource.com"
            review="android-review.googlesource.com"
-           revision="refs/tags/android-6.0.1_r31" />
+           revision="refs/tags/android-6.0.1_r43" />
 
   <remote  name="cm"
            fetch="https://github.com/CyanogenMod"
@@ -24,8 +24,10 @@
 <!-- BEGIN ANDROID-X86 -->
   <project path="kernel/kernel-4.4" name="kernel/common" remote="x86" revision="kernel-4.4" />
   <project path="bootable/newinstaller" name="platform/bootable/newinstaller" remote="x86" revision="marshmallow-x86" />
+  <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" />
@@ -33,7 +35,8 @@
   <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/llvm" name="platform/external/llvm" groups="pdk" 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"/>
@@ -52,7 +55,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" />
@@ -204,7 +206,6 @@
   <project path="hardware/akm" name="android_hardware_akm" />
   <project path="hardware/broadcom/libbt" name="android_hardware_broadcom_libbt" groups="notdefault,pdk" />
   <project path="hardware/broadcom/wlan" name="android_hardware_broadcom_wlan" groups="notdefault,pdk,broadcom_wlan" />
-  <project path="hardware/cm" name="android_hardware_cm" />
   <project path="hardware/cyanogen" name="android_hardware_cyanogen" />
   <project path="hardware/intel/common/libmix" name="android_hardware_intel_common_libmix" groups="intel" />
   <project path="hardware/intel/common/libva" name="android_hardware_intel_common_libva" groups="intel" />
@@ -279,6 +280,7 @@
   <project path="packages/apps/Exchange" name="android_packages_apps_Exchange" groups="pdk-fs" />
   <project path="packages/apps/FMRadio" name="android_packages_apps_FMRadio" groups="pdk-fs" />
   <project path="packages/apps/Gallery2" name="android_packages_apps_Gallery2" groups="pdk-fs" />
+  <project path="packages/apps/Gello" name="android_packages_apps_Gello" />
   <project path="packages/apps/HTMLViewer" name="android_packages_apps_HTMLViewer" groups="pdk-fs" />
   <project path="packages/apps/InCallUI" name="android_packages_apps_InCallUI" groups="pdk-fs" />
   <project path="packages/apps/KeyChain" name="android_packages_apps_KeyChain" groups="pdk-fs" />
@@ -309,6 +311,7 @@
   <project path="packages/providers/CalendarProvider" name="android_packages_providers_CalendarProvider" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/providers/CallLogProvider" name="android_packages_providers_CallLogProvider" groups="pdk-fs" />
   <project path="packages/providers/ContactsProvider" name="android_packages_providers_ContactsProvider" groups="pdk-cw-fs,pdk-fs" />
+  <project path="packages/providers/DataUsageProvider" name="android_packages_providers_DataUsageProvider" />
   <project path="packages/providers/DownloadProvider" name="android_packages_providers_DownloadProvider" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/providers/MediaProvider" name="android_packages_providers_MediaProvider" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/providers/PartnerBookmarksProvider" name="android_packages_providers_PartnerBookmarksProvider" groups="pdk-fs" />
@@ -347,7 +350,9 @@
 <!-- END CYANOGENMOD -->
 
 <!-- CMSDK SAMPLES -->
-  <project path="vendor/cmsdk/samples/weatherproviderservice" name="android_packages_apps_WundergroundWeatherProvider" groups="notdefault" />
+  <project path="vendor/cmsdk/samples/weatherproviderservice/OpenWeatherMapProvider" name="android_packages_apps_OpenWeatherMapProvider" groups="notdefault" />
+  <project path="vendor/cmsdk/samples/weatherproviderservice/WundergroundWeatherProvider" name="android_packages_apps_WundergroundWeatherProvider" groups="notdefault" />
+  <project path="vendor/cmsdk/samples/weatherproviderservice/YahooWeatherProvider" name="android_packages_apps_YahooWeatherProvider" groups="notdefault" />
 <!-- END CMSDK SAMPLES -->
 
 <!-- BEGIN AOSP -->
@@ -456,7 +461,6 @@
   <project path="external/littlemock" name="platform/external/littlemock" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/lld" name="platform/external/lld" groups="pdk-fs" remote="aosp" />
   <project path="external/lldb" name="platform/external/lldb" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/llvm" name="platform/external/llvm" groups="pdk" remote="aosp" />
   <project path="external/ltrace" name="platform/external/ltrace" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/marisa-trie" name="platform/external/marisa-trie" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/markdown" name="platform/external/markdown" groups="pdk-cw-fs,pdk-fs" remote="aosp" />