OSDN Git Service

Merge remote-tracking branch 'aosp/android-7.0.0_r7' into nougat-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 5 Oct 2016 15:18:21 +0000 (23:18 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 5 Oct 2016 15:18:21 +0000 (23:18 +0800)
1  2 
default.xml

diff --cc default.xml
@@@ -2,75 -2,14 +2,75 @@@
  <manifest>
  
    <remote  name="aosp"
 -           fetch=".." />
 +           fetch="https://android.googlesource.com/" />
 +  <remote  name="x86"
 +           fetch="." />
-   <default revision="refs/tags/android-7.0.0_r1"
+   <default revision="refs/tags/android-7.0.0_r7"
             remote="aosp"
 -           sync-j="4" />
 +           sync-c="true"
 +           sync-j="1" />
  
 -  <project path="build" name="platform/build" groups="pdk,tradefed" >
 +  <!-- from x86 port repositories -->
 +  <project path="build" name="platform/build" groups="pdk,tradefed" remote="x86" revision="nougat-x86" >
      <copyfile src="core/root.mk" dest="Makefile" />
    </project>
 +  <project path="kernel" name="kernel/common" remote="x86" revision="kernel-4.4" />
 +  <project path="bionic" name="platform/bionic" groups="pdk" remote="x86" revision="nougat-x86" />
 +  <project path="bootable/newinstaller" name="platform/bootable/newinstaller" remote="x86" revision="nougat-x86" />
 +  <project path="device/generic/common" name="device/generic/common" groups="pdk" remote="x86" revision="nougat-x86" />
 +  <project path="device/generic/firmware" name="device/generic/firmware" remote="x86" revision="nougat-x86" />
 +  <project path="device/generic/x86" name="device/generic/x86" groups="pdk" remote="x86" revision="nougat-x86" />
 +  <project path="device/generic/x86_64" name="device/generic/x86_64" groups="pdk" remote="x86" revision="nougat-x86" />
 +  <project path="external/alsa-lib" name="platform/external/alsa-lib" remote="x86" revision="nougat-x86" />
 +  <project path="external/alsa-utils" name="platform/external/alsa-utils" remote="x86" revision="nougat-x86" />
 +  <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" remote="x86" revision="nougat-x86" groups="notdefault" />
 +  <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" remote="x86" revision="nougat-x86" />
 +  <project path="external/bluetooth/sbc" name="platform/external/bluetooth/sbc" remote="x86" revision="nougat-x86" />
 +  <project path="external/busybox" name="platform/external/busybox" remote="x86" revision="nougat-x86" />
 +  <project path="external/drm_gralloc" name="platform/external/drm_gralloc" groups="drm_gralloc" remote="x86" revision="nougat-x86" />
 +  <project path="external/drm_hwcomposer" name="platform/external/drm_hwcomposer" groups="drm_hwcomposer" remote="x86" revision="nougat-x86" />
 +  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" groups="pdk" remote="x86" revision="nougat-x86" />
 +  <project path="external/eject" name="platform/external/eject" remote="x86" revision="nougat-x86" />
 +  <project path="external/exfat" name="platform/external/exfat" remote="x86" revision="nougat-x86" />
 +  <project path="external/ffmpeg" name="platform/external/ffmpeg" remote="x86" revision="nougat-x86" />
 +  <project path="external/googleanalytics" name="platform/external/googleanalytics" remote="x86" revision="nougat-x86" />
 +  <project path="external/koush/Superuser" name="platform/external/koush/Superuser" remote="x86" revision="nougat-x86" />
 +  <project path="external/koush/Widgets" name="platform/external/koush/Widgets" remote="x86" revision="nougat-x86" />
 +  <project path="external/libdrm" name="platform/external/libdrm" groups="pdk" remote="x86" revision="nougat-x86" />
 +  <project path="external/libtruezip" name="platform/external/libtruezip" remote="x86" revision="nougat-x86" />
 +  <project path="external/llvm" name="platform/external/llvm" groups="pdk" remote="x86" revision="nougat-x86" />
 +  <project path="external/mesa" name="platform/external/mesa" remote="x86" revision="nougat-x86" />
 +  <project path="external/ntfs-3g" name="platform/external/ntfs-3g" remote="x86" revision="nougat-x86" />
 +  <project path="external/s2tc" name="platform/external/s2tc" remote="x86" revision="nougat-x86" />
 +  <project path="external/stagefright-plugins" name="platform/external/stagefright-plugins" remote="x86" revision="nougat-x86" />
 +  <project path="external/v86d" name="platform/external/v86d" remote="x86" revision="nougat-x86" />
 +  <project path="frameworks/av" name="platform/frameworks/av" groups="pdk" remote="x86" revision="nougat-x86" />
 +  <project path="frameworks/base" name="platform/frameworks/base" groups="pdk-cw-fs,pdk-fs" remote="x86" revision="nougat-x86" />
 +  <project path="frameworks/native" name="platform/frameworks/native" groups="pdk" remote="x86" revision="nougat-x86" />
 +  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" groups="pdk,broadcom_wlan" remote="x86" revision="nougat-x86" />
 +  <project path="hardware/gps" name="platform/hardware/gps" remote="x86" revision="nougat-x86" />
 +  <project path="hardware/intel/audio_media" name="platform/hardware/intel/audio_media" groups="intel" remote="x86" revision="nougat-x86" />
 +  <project path="hardware/intel/libsensors" name="platform/hardware/intel/libsensors" remote="x86" revision="nougat-x86" />
 +  <project path="hardware/libaudio" name="platform/hardware/libaudio" remote="x86" revision="nougat-x86" />
 +  <project path="hardware/libcamera" name="platform/hardware/libcamera" remote="x86" revision="nougat-x86" />
 +  <project path="hardware/libhardware" name="platform/hardware/libhardware" groups="pdk" remote="x86" revision="nougat-x86" />
 +  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" groups="pdk" remote="x86" revision="nougat-x86" />
 +  <project path="hardware/liblights" name="platform/hardware/liblights" remote="x86" revision="nougat-x86" />
 +  <project path="hardware/libsensors" name="platform/hardware/libsensors" remote="x86" revision="nougat-x86" />
 +  <project path="hardware/ril" name="platform/hardware/ril" groups="pdk" remote="x86" revision="nougat-x86" />
 +  <project path="hardware/x86power" name="platform/hardware/x86power" remote="x86" revision="nougat-x86" />
 +  <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" groups="pdk-cw-fs,pdk-fs" remote="x86" revision="nougat-x86" />
 +  <project path="packages/apps/CMFileManager" name="platform/packages/apps/CMFileManager" remote="x86" revision="nougat-x86" />
 +  <project path="packages/apps/Eleven" name="platform/packages/apps/Eleven" remote="x86" revision="nougat-x86" />
 +  <project path="packages/apps/Launcher3" name="platform/packages/apps/Launcher3" groups="pdk-fs" remote="x86" revision="nougat-x86" />
 +  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" groups="pdk-fs" remote="x86" revision="nougat-x86" />
 +  <project path="packages/apps/TSCalibration2" name="platform/packages/apps/TSCalibration2" remote="x86" revision="nougat-x86" />
 +  <project path="packages/services/Analytics" name="platform/packages/services/Analytics" remote="x86" revision="nougat-x86" />
 +  <project path="system/core" name="platform/system/core" groups="pdk" remote="x86" revision="nougat-x86" />
 +  <project path="system/extras" name="platform/system/extras" groups="pdk" remote="x86" revision="nougat-x86" />
 +  <project path="system/vold" name="platform/system/vold" groups="pdk" remote="x86" revision="nougat-x86" />
 +
 +  <!-- from original Android repositories -->
    <project path="build/blueprint" name="platform/build/blueprint" groups="pdk,tradefed" />
    <project path="build/kati" name="platform/build/kati" groups="pdk,tradefed" />
    <project path="build/soong" name="platform/build/soong" groups="pdk,tradefed" >