From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Mon, 18 Apr 2016 10:37:30 +0000 (+0800)
Subject: Merge remote-tracking branch 'aosp/android-6.0.1_r31' into marshmallow-x86
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fmanifest.git;a=commitdiff_plain;h=364a33514b0b4bd4d207530ac10971515dd0058c

Merge remote-tracking branch 'aosp/android-6.0.1_r31' into marshmallow-x86
---

364a33514b0b4bd4d207530ac10971515dd0058c
diff --cc default.xml
index aa3f2db,590f77c..0d93e62
--- a/default.xml
+++ b/default.xml
@@@ -2,111 -2,61 +2,113 @@@
  <manifest>
  
    <remote  name="aosp"
 -           fetch=".." />
 +           fetch="https://android.googlesource.com/" />
 +  <remote  name="x86"
 +           fetch="." />
-   <default revision="refs/tags/android-6.0.1_r24"
+   <default revision="refs/tags/android-6.0.1_r31"
             remote="aosp"
 +           sync-c="true"
             sync-j="4" />
  
 -  <project path="build" name="platform/build" groups="pdk" >
 +  <!-- from x86 port repositories -->
 +  <project path="build" name="platform/build" groups="pdk" remote="x86" revision="marshmallow-x86" >
      <copyfile src="core/root.mk" dest="Makefile" />
    </project>
 +  <project path="kernel" name="kernel/common" remote="x86" revision="kernel-4.4" />
 +  <project path="art" name="platform/art" groups="pdk" remote="x86" revision="marshmallow-x86" />
 +  <project path="bionic" name="platform/bionic" groups="pdk" remote="x86" revision="marshmallow-x86" />
 +  <project path="bootable/newinstaller" name="platform/bootable/newinstaller" remote="x86" revision="marshmallow-x86" />
 +  <project path="device/generic/common" name="device/generic/common" groups="pdk" remote="x86" revision="marshmallow-x86" />
 +  <project path="device/generic/x86" name="device/generic/x86" groups="pdk" remote="x86" revision="marshmallow-x86" />
 +  <project path="device/generic/x86_64" name="device/generic/x86_64" groups="pdk" 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" />
 +  <project path="external/drm_gralloc" name="platform/external/drm_gralloc" groups="drm_gralloc" remote="x86" revision="marshmallow-x86" />
 +  <project path="external/drm_hwcomposer" name="platform/external/drm_hwcomposer" groups="drm_hwcomposer" remote="x86" revision="marshmallow-x86" />
 +  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" groups="pdk" remote="x86" revision="marshmallow-x86" />
 +  <project path="external/eject" name="platform/external/eject" remote="x86" revision="marshmallow-x86" />
 +  <project path="external/exfat" name="platform/external/exfat" remote="x86" revision="marshmallow-x86" />
 +  <project path="external/ffmpeg" name="platform/external/ffmpeg" remote="x86" revision="marshmallow-x86" />
 +  <project path="external/koush/Superuser" name="platform/external/koush/Superuser" remote="x86" revision="marshmallow-x86" />
 +  <project path="external/koush/Widgets" name="platform/external/koush/Widgets" remote="x86" revision="marshmallow-x86" />
 +  <project path="external/libdrm" name="platform/external/libdrm" groups="pdk" remote="x86" revision="marshmallow-x86" />
 +  <project path="external/libpciaccess" name="platform/external/libpciaccess" remote="x86" revision="marshmallow-x86" />
 +  <project path="external/libtruezip" name="platform/external/libtruezip" 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/ntfs-3g" name="platform/external/ntfs-3g" remote="x86" revision="marshmallow-x86" />
 +  <project path="external/parted" name="platform/external/parted" remote="x86" revision="marshmallow-x86" />
 +  <project path="external/stagefright-plugins" name="platform/external/stagefright-plugins" remote="x86" revision="marshmallow-x86" />
 +  <project path="external/toybox" name="platform/external/toybox" groups="pdk" remote="x86" revision="marshmallow-x86" />
 +  <project path="external/v86d" name="platform/external/v86d" remote="x86" revision="marshmallow-x86" />
 +  <project path="frameworks/av" name="platform/frameworks/av" groups="pdk" remote="x86" revision="marshmallow-x86" />
 +  <project path="frameworks/base" name="platform/frameworks/base" groups="pdk-cw-fs,pdk-fs" remote="x86" revision="marshmallow-x86" />
 +  <project path="frameworks/native" name="platform/frameworks/native" groups="pdk" remote="x86" revision="marshmallow-x86" />
 +  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" groups="pdk,broadcom_wlan" 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" />
 +  <project path="hardware/libaudio" name="platform/hardware/libaudio" remote="x86" revision="marshmallow-x86" />
 +  <project path="hardware/libcamera" name="platform/hardware/libcamera" remote="x86" revision="marshmallow-x86" />
 +  <project path="hardware/libhardware" name="platform/hardware/libhardware" groups="pdk" remote="x86" revision="marshmallow-x86" />
 +  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" groups="pdk" remote="x86" revision="marshmallow-x86" />
 +  <project path="hardware/liblights" name="platform/hardware/liblights" remote="x86" revision="marshmallow-x86" />
 +  <project path="hardware/libsensors" name="platform/hardware/libsensors" remote="x86" revision="marshmallow-x86" />
 +  <project path="hardware/ril" name="platform/hardware/ril" groups="pdk" remote="x86" revision="marshmallow-x86" />
 +  <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" groups="pdk-cw-fs,pdk-fs" remote="x86" revision="marshmallow-x86" />
 +  <project path="packages/apps/CMFileManager" name="platform/packages/apps/CMFileManager" remote="x86" revision="marshmallow-x86" />
 +  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" groups="pdk-fs" remote="x86" revision="marshmallow-x86" />
 +  <project path="packages/apps/TSCalibration2" name="platform/packages/apps/TSCalibration2" remote="x86" revision="marshmallow-x86" />
 +  <project path="system/core" name="platform/system/core" groups="pdk" remote="x86" revision="marshmallow-x86" />
 +  <project path="system/extras" name="platform/system/extras" groups="pdk" remote="x86" revision="marshmallow-x86" />
 +  <project path="system/vold" name="platform/system/vold" groups="pdk" remote="x86" revision="marshmallow-x86" />
 +
 +  <!-- from original Android repositories -->
    <project path="abi/cpp" name="platform/abi/cpp" groups="pdk" />
 -  <project path="art" name="platform/art" groups="pdk" />
 -  <project path="bionic" name="platform/bionic" groups="pdk" />
    <project path="bootable/recovery" name="platform/bootable/recovery" groups="pdk" />
 -  <project path="cts" name="platform/cts" groups="cts,pdk-cw-fs,pdk-fs" />
 +  <project path="cts" name="platform/cts" groups="notdefault,cts,pdk-cw-fs,pdk-fs" />
    <project path="dalvik" name="platform/dalvik" groups="pdk-cw-fs,pdk-fs" />
 -  <project path="developers/build" name="platform/developers/build" />
 -  <project path="developers/demos" name="platform/developers/demos" />
 -  <project path="developers/docs" name="platform/developers/docs" />
 -  <project path="developers/samples/android" name="platform/developers/samples/android" />
 +  <project path="developers/build" name="platform/developers/build" groups="notdefault" />
 +  <project path="developers/demos" name="platform/developers/demos" groups="notdefault" />
 +  <project path="developers/docs" name="platform/developers/docs" groups="notdefault" />
 +  <project path="developers/samples/android" name="platform/developers/samples/android" groups="notdefault" />
    <project path="development" name="platform/development" groups="pdk-cw-fs,pdk-fs" />
 -  <project path="device/asus/deb" name="device/asus/deb" groups="device,flo" />
 -  <project path="device/asus/flo" name="device/asus/flo" groups="device,flo" />
 -  <project path="device/asus/flo-kernel" name="device/asus/flo-kernel" groups="device,flo" clone-depth="1" />
 -  <project path="device/asus/fugu" name="device/asus/fugu" groups="device,fugu,broadcom_pdk" />
 -  <project path="device/asus/fugu-kernel" name="device/asus/fugu-kernel" groups="device,fugu,broadcom_pdk" clone-depth="1" />
 +  <project path="device/asus/deb" name="device/asus/deb" groups="notdefault,device,flo" />
 +  <project path="device/asus/flo" name="device/asus/flo" groups="notdefault,device,flo" />
 +  <project path="device/asus/flo-kernel" name="device/asus/flo-kernel" groups="notdefault,device,flo" clone-depth="1" />
 +  <project path="device/asus/fugu" name="device/asus/fugu" groups="notdefault,device,fugu,broadcom_pdk" />
 +  <project path="device/asus/fugu-kernel" name="device/asus/fugu-kernel" groups="notdefault,device,fugu,broadcom_pdk" clone-depth="1" />
    <project path="device/common" name="device/common" groups="pdk-cw-fs,pdk-fs" />
 -  <project path="device/lge/bullhead" name="device/lge/bullhead" groups="device,bullhead" />
 -  <project path="device/lge/bullhead-kernel" name="device/lge/bullhead-kernel" groups="device,bullhead" />
 -  <project path="device/generic/arm64" name="device/generic/arm64" groups="pdk" />
 -  <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" groups="pdk" />
 -  <project path="device/generic/common" name="device/generic/common" groups="pdk" />
 -  <project path="device/generic/goldfish" name="device/generic/goldfish" groups="pdk" />
 -  <project path="device/generic/mips" name="device/generic/mips" groups="pdk" />
 -  <project path="device/generic/mini-emulator-arm64" name="device/generic/mini-emulator-arm64" groups="pdk" />
 -  <project path="device/generic/mini-emulator-armv7-a-neon" name="device/generic/mini-emulator-armv7-a-neon" groups="pdk" />
 -  <project path="device/generic/mini-emulator-mips" name="device/generic/mini-emulator-mips" groups="pdk" />
 -  <project path="device/generic/mini-emulator-x86" name="device/generic/mini-emulator-x86" groups="pdk" />
 -  <project path="device/generic/mini-emulator-x86_64" name="device/generic/mini-emulator-x86_64" groups="pdk" />
 -  <project path="device/generic/qemu" name="device/generic/qemu" />
 -  <project path="device/generic/x86" name="device/generic/x86" groups="pdk" />
 -  <project path="device/generic/x86_64" name="device/generic/x86_64" groups="pdk" />
 -  <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
 -  <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
 -  <project path="device/google/atv" name="device/google/atv" groups="device,fugu,broadcom_pdk,generic_fs" />
 -  <project path="device/google/dragon" name="device/google/dragon" groups="device,dragon" />
 -  <project path="device/google/dragon-kernel" name="device/google/dragon-kernel" groups="device,dragon" clone-depth="1" />
 -  <project path="device/htc/flounder" name="device/htc/flounder" groups="device,flounder,broadcom_pdk" />
 -  <project path="device/htc/flounder-kernel" name="device/htc/flounder-kernel" groups="device,flounder,broadcom_pdk" clone-depth="1" />
 -  <project path="device/huawei/angler" name="device/huawei/angler" groups="device,angler,broadcom_pdk" />
 -  <project path="device/huawei/angler-kernel" name="device/huawei/angler-kernel" groups="device,angler,broadcom_pdk" />
 -  <project path="device/lge/hammerhead" name="device/lge/hammerhead" groups="device,hammerhead,broadcom_pdk,generic_fs" />
 -  <project path="device/lge/hammerhead-kernel" name="device/lge/hammerhead-kernel" groups="device,hammerhead,broadcom_pdk,generic_fs" clone-depth="1" />
 -  <project path="device/moto/shamu" name="device/moto/shamu" groups="device,shamu,broadcom_pdk" />
 -  <project path="device/moto/shamu-kernel" name="device/moto/shamu-kernel" groups="device,shamu,broadcom_pdk" clone-depth="1" />
 +  <project path="device/lge/bullhead" name="device/lge/bullhead" groups="notdefault,device,bullhead" />
 +  <project path="device/lge/bullhead-kernel" name="device/lge/bullhead-kernel" groups="notdefault,device,bullhead" />
 +  <project path="device/generic/arm64" name="device/generic/arm64" groups="notdefault,pdk" />
 +  <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" groups="notdefault,pdk" />
 +  <project path="device/generic/goldfish" name="device/generic/goldfish" groups="notdefault,pdk" />
 +  <project path="device/generic/mips" name="device/generic/mips" groups="notdefault,pdk" />
 +  <project path="device/generic/mini-emulator-arm64" name="device/generic/mini-emulator-arm64" groups="notdefault,pdk" />
 +  <project path="device/generic/mini-emulator-armv7-a-neon" name="device/generic/mini-emulator-armv7-a-neon" groups="notdefault,pdk" />
 +  <project path="device/generic/mini-emulator-mips" name="device/generic/mini-emulator-mips" groups="notdefault,pdk" />
 +  <project path="device/generic/mini-emulator-x86" name="device/generic/mini-emulator-x86" groups="notdefault,pdk" />
 +  <project path="device/generic/mini-emulator-x86_64" name="device/generic/mini-emulator-x86_64" groups="notdefault,pdk" />
 +  <project path="device/generic/qemu" name="device/generic/qemu" groups="notdefault" />
 +  <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="notdefault,device" />
 +  <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="notdefault,device" />
 +  <project path="device/google/atv" name="device/google/atv" groups="notdefault,device,fugu,broadcom_pdk,generic_fs" />
++  <project path="device/google/dragon" name="device/google/dragon" groups="notdefault,device,dragon" />
++  <project path="device/google/dragon-kernel" name="device/google/dragon-kernel" groups="notdefault,device,dragon" clone-depth="1" />
 +  <project path="device/htc/flounder" name="device/htc/flounder" groups="notdefault,device,flounder,broadcom_pdk" />
 +  <project path="device/htc/flounder-kernel" name="device/htc/flounder-kernel" groups="notdefault,device,flounder,broadcom_pdk" clone-depth="1" />
 +  <project path="device/huawei/angler" name="device/huawei/angler" groups="notdefault,device,angler,broadcom_pdk" />
 +  <project path="device/huawei/angler-kernel" name="device/huawei/angler-kernel" groups="notdefault,device,angler,broadcom_pdk" />
 +  <project path="device/lge/hammerhead" name="device/lge/hammerhead" groups="notdefault,device,hammerhead,broadcom_pdk,generic_fs" />
 +  <project path="device/lge/hammerhead-kernel" name="device/lge/hammerhead-kernel" groups="notdefault,device,hammerhead,broadcom_pdk,generic_fs" clone-depth="1" />
 +  <project path="device/moto/shamu" name="device/moto/shamu" groups="notdefault,device,shamu,broadcom_pdk" />
 +  <project path="device/moto/shamu-kernel" name="device/moto/shamu-kernel" groups="notdefault,device,shamu,broadcom_pdk" clone-depth="1" />
    <project path="device/sample" name="device/sample" groups="pdk" />
 -  <project path="docs/source.android.com" name="platform/docs/source.android.com" groups="pdk-cw-fs,pdk-fs" />
 +  <project path="docs/source.android.com" name="platform/docs/source.android.com" groups="notdefault,pdk-cw-fs,pdk-fs" />
    <project path="external/aac" name="platform/external/aac" groups="pdk" />
    <project path="external/android-clat" name="platform/external/android-clat" groups="pdk-cw-fs,pdk-fs" />
    <project path="external/android-mock" name="platform/external/android-mock" groups="pdk-cw-fs,pdk-fs" />