summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-12-05 09:48:57 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2012-12-05 09:49:04 -0800
commit64d49f0ab50fcac0bf4592ddbf8f649fb17c6223 (patch)
tree871235be35eca16b3d45271bab81c83c136b6a0c
parent43545df9292383471a1ccc7b4382be2198ded02b (diff)
parent0cc40d32e50323ae356f64b4d84af08ab963eef5 (diff)
downloadmanifest-64d49f0ab50fcac0bf4592ddbf8f649fb17c6223.tar.gz
Merge from master
Change-Id: I002801f6c16424a08d3fd27bc5018397da51311e
-rw-r--r--default.xml15
1 files changed, 15 insertions, 0 deletions
diff --git a/default.xml b/default.xml
index 3e56b51cb..851bed965 100644
--- a/default.xml
+++ b/default.xml
@@ -31,6 +31,8 @@
<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/phantasm" name="device/google/phantasm" groups="device" />
+ <project path="device/lge/mako" name="device/lge/mako" groups="device" />
+ <project path="device/lge/mako-kernel" name="device/lge/mako-kernel" groups="device" />
<project path="device/sample" name="device/sample" />
<project path="device/samsung/maguro" name="device/samsung/maguro" groups="device" />
<project path="device/samsung/manta" name="device/samsung/manta" groups="device" />
@@ -73,6 +75,7 @@
<project path="external/easymock" name="platform/external/easymock" />
<project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" />
<project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" />
+ <project path="external/eigen" name="platform/external/eigen" />
<project path="external/elfutils" name="platform/external/elfutils" />
<project path="external/embunit" name="platform/external/embunit" />
<project path="external/emma" name="platform/external/emma" />
@@ -229,6 +232,18 @@
<project path="hardware/invensense" name="platform/hardware/invensense" />
<project path="hardware/libhardware" name="platform/hardware/libhardware" />
<project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" />
+ <project path="hardware/msm7k" name="platform/hardware/msm7k" />
+ <project path="hardware/qcom/audio" name="platform/hardware/qcom/audio" />
+ <project path="hardware/qcom/bt" name="platform/hardware/qcom/bt" />
+ <project path="hardware/qcom/camera" name="platform/hardware/qcom/camera" />
+ <project path="hardware/qcom/display" name="platform/hardware/qcom/display" />
+ <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" />
+ <project path="hardware/qcom/keymaster" name="platform/hardware/qcom/keymaster" />
+ <project path="hardware/qcom/media" name="platform/hardware/qcom/media" />
+ <project path="hardware/qcom/msm8960" name="platform/hardware/qcom/msm8960" />
+ <project path="hardware/qcom/power" name="platform/hardware/qcom/power" />
+ <project path="hardware/qcom/sensors" name="platform/hardware/qcom/sensors" />
+ <project path="hardware/qcom/wlan" name="platform/hardware/qcom/wlan" />
<project path="hardware/ril" name="platform/hardware/ril" />
<project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" />
<project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />