OSDN Git Service

cm: use marshmallow-x86 version of external/llvm
[android-x86/manifest.git] / cm.xml
diff --git a/cm.xml b/cm.xml
index 18a289d..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_r22" />
+           revision="refs/tags/android-6.0.1_r43" />
 
   <remote  name="cm"
            fetch="https://github.com/CyanogenMod"
 <!-- 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" />
@@ -93,6 +95,7 @@
   <project path="external/curl" name="android_external_curl" />
   <project path="external/dhcpcd" name="android_external_dhcpcd" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/dnsmasq" name="android_external_dnsmasq" groups="pdk" />
+  <project path="external/doclava" name="android_external_doclava" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/e2fsprogs" name="android_external_e2fsprogs" groups="pdk" />
   <project path="external/ebtables" name="android_external_ebtables" />
   <project path="external/elfutils" name="android_external_elfutils" groups="pdk" />
   <project path="external/google" name="android_external_google" />
   <project path="external/gmock" name="android_external_gmock"/>
   <project path="external/gson" name="android_external_gson" />
+  <project path="external/guava" name="android_external_guava" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/htop" name="android_external_htop" />
   <project path="external/icu" name="android_external_icu" groups="pdk" />
   <project path="external/iproute2" name="android_external_iproute2" groups="pdk" />
   <project path="external/iptables" name="android_external_iptables" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/jarjar" name="android_external_jarjar" groups="pdk" />
   <project path="external/jpeg" name="android_external_jpeg" groups="pdk" />
+  <project path="external/json-c" name="android_external_json-c" />
   <project path="external/jsr305" name="android_external_jsr305" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/koush/AndroidAsync" name="AndroidAsync" />
   <project path="external/koush/ion" name="ion" />
   <project path="external/unrar" name="android_external_unrar" />
   <project path="external/unzip" name="android_external_unzip" />
   <project path="external/vim" name="android_external_vim" />
+  <project path="external/vogar" name="android_external_vogar" groups="pdk" />
   <project path="external/wpa_supplicant_8" name="android_external_wpa_supplicant_8" groups="pdk" />
   <project path="external/yaffs2" name="android_external_yaffs2" groups="pdk" />
   <project path="external/zip" name="android_external_zip" />
   <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" />
   <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" />
   <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" />
   <project path="packages/providers/ThemesProvider" name="android_packages_providers_ThemesProvider" />
   <project path="packages/providers/TvProvider" name="android_packages_providers_TvProvider" groups="pdk-fs" />
   <project path="packages/providers/UserDictionaryProvider" name="android_packages_providers_UserDictionaryProvider" groups="pdk-cw-fs,pdk-fs" />
+  <project path="packages/providers/WeatherProvider" name="android_packages_providers_WeatherProvider" />
   <project path="packages/screensavers/Basic" name="android_packages_screensavers_Basic" groups="pdk-fs" />
   <project path="packages/screensavers/PhotoTable" name="android_packages_screensavers_PhotoTable" groups="pdk-fs" />
   <project path="packages/screensavers/WebView" name="android_packages_screensavers_WebView" groups="pdk-fs" />
+  <project path="packages/services/LiveLockScreenService" name="android_packages_services_LiveLockScreenService" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/services/Mms" name="android_packages_services_Mms" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/services/Telecomm" name="android_packages_services_Telecomm" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/services/Telephony" name="android_packages_services_Telephony" groups="pdk-cw-fs,pdk-fs" />
   <project path="vendor/qcom/opensource/time-services" name="android_vendor_qcom_opensource_time-services" groups="notdefault" />
 <!-- END CYANOGENMOD -->
 
+<!-- CMSDK SAMPLES -->
+  <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 -->
   <project path="developers/build" name="platform/developers/build" groups="notdefault" remote="aosp" />
   <project path="developers/samples/android" name="platform/developers/samples/android" remote="aosp" />
   <project path="external/crcalc" name="platform/external/crcalc" groups="pdk-fs" remote="aosp" />
   <project path="external/deqp" name="platform/external/deqp" groups="pdk-fs" remote="aosp" />
   <project path="external/dexmaker" name="platform/external/dexmaker" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
-  <project path="external/doclava" name="platform/external/doclava" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/donuts" name="platform/external/donuts" groups="pdk-fs" remote="aosp" />
   <project path="external/droiddriver" name="platform/external/droiddriver" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/easymock" name="platform/external/easymock" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/google-tv-pairing-protocol" name="platform/external/google-tv-pairing-protocol" groups="pdk-fs" remote="aosp" />
   <project path="external/gptfdisk" name="android_external_gptfdisk" groups="pdk-fs" />
   <project path="external/gtest" name="platform/external/gtest" groups="pdk" remote="aosp" />
-  <project path="external/guava" name="platform/external/guava" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/hamcrest" name="platform/external/hamcrest" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/harfbuzz_ng" name="platform/external/harfbuzz_ng" groups="pdk,qcom_msm8x26" remote="aosp" />
   <project path="external/hyphenation-patterns" name="platform/external/hyphenation-patterns" groups="pdk-fs" remote="aosp" />
   <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" />
   <project path="external/valgrind" name="platform/external/valgrind" groups="pdk" remote="aosp" />
   <project path="external/vboot_reference" name="platform/external/vboot_reference" groups="vboot" remote="aosp" />
   <project path="external/vixl" name="platform/external/vixl" groups="pdk" remote="aosp" />
-  <project path="external/vogar" name="platform/external/vogar" groups="pdk" remote="aosp" />
   <project path="external/webp" name="platform/external/webp" groups="pdk,qcom_msm8x26" remote="aosp" />
   <project path="external/webrtc" name="platform/external/webrtc" groups="pdk" remote="aosp" />
   <project path="external/xmlwriter" name="platform/external/xmlwriter" groups="pdk-cw-fs,pdk-fs" remote="aosp" />