summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project2013-03-01 13:27:46 -0600
committerThe Android Open Source Project2013-03-01 13:27:46 -0600
commita7f38b7d52bcd31e310d2b9cc6c060c71d4e0442 (patch)
tree5dda11a5cecc15ebeb9737d1674e82dce0bb4653
parent8dfb5e34a7e32be0c5ab5009664bf2258cbc051a (diff)
parent70c902cf65b201fbe2a6ebe9684ca62a481f1b00 (diff)
downloadplatform-manifest-a7f38b7d52bcd31e310d2b9cc6c060c71d4e0442.tar.gz
platform-manifest-a7f38b7d52bcd31e310d2b9cc6c060c71d4e0442.tar.xz
platform-manifest-a7f38b7d52bcd31e310d2b9cc6c060c71d4e0442.zip
Merge from master
Change-Id: I8b5010bff1cf2054f2737c46840342134c793862
-rw-r--r--default.xml32
1 files changed, 32 insertions, 0 deletions
diff --git a/default.xml b/default.xml
index 1f37e45..2082b3a 100644
--- a/default.xml
+++ b/default.xml
@@ -19,6 +19,8 @@
19 <project path="cts" name="platform/cts" /> 19 <project path="cts" name="platform/cts" />
20 <project path="dalvik" name="platform/dalvik" /> 20 <project path="dalvik" name="platform/dalvik" />
21 <project path="development" name="platform/development" /> 21 <project path="development" name="platform/development" />
22 <project path="device/asus/grouper" name="device/asus/grouper" groups="device,grouper" />
23 <project path="device/asus/tilapia" name="device/asus/tilapia" groups="device,grouper" />
22 <project path="device/common" name="device/common" /> 24 <project path="device/common" name="device/common" />
23 <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" groups="pdk" /> 25 <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" groups="pdk" />
24 <project path="device/generic/armv7-a" name="device/generic/armv7-a" groups="pdk" /> 26 <project path="device/generic/armv7-a" name="device/generic/armv7-a" groups="pdk" />
@@ -28,7 +30,16 @@
28 <project path="device/generic/x86" name="device/generic/x86" groups="pdk" /> 30 <project path="device/generic/x86" name="device/generic/x86" groups="pdk" />
29 <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" /> 31 <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
30 <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" /> 32 <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
33 <project path="device/lge/mako" name="device/lge/mako" groups="device,mako" />
34 <project path="device/lge/mako-kernel" name="device/lge/mako-kernel" groups="device,mako" />
31 <project path="device/sample" name="device/sample" groups="pdk" /> 35 <project path="device/sample" name="device/sample" groups="pdk" />
36 <project path="device/samsung/maguro" name="device/samsung/maguro" groups="device,tuna" />
37 <project path="device/samsung/manta" name="device/samsung/manta" groups="device,manta" />
38 <project path="device/samsung/toro" name="device/samsung/toro" groups="device,tuna" />
39 <project path="device/samsung/toroplus" name="device/samsung/toroplus" groups="device,tuna" />
40 <project path="device/samsung/tuna" name="device/samsung/tuna" groups="device,tuna" />
41 <project path="device/samsung_slsi/arndale" name="device/samsung_slsi/arndale" groups="device" />
42 <project path="device/ti/panda" name="device/ti/panda" groups="device" />
32 <project path="docs/source.android.com" name="platform/docs/source.android.com" /> 43 <project path="docs/source.android.com" name="platform/docs/source.android.com" />
33 <project path="external/aac" name="platform/external/aac" groups="pdk" /> 44 <project path="external/aac" name="platform/external/aac" groups="pdk" />
34 <project path="external/android-clat" name="platform/external/android-clat" /> 45 <project path="external/android-clat" name="platform/external/android-clat" />
@@ -218,9 +229,30 @@
218 <project path="frameworks/volley" name="platform/frameworks/volley" /> 229 <project path="frameworks/volley" name="platform/frameworks/volley" />
219 <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" /> 230 <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" />
220 <project path="gdk" name="platform/gdk" /> 231 <project path="gdk" name="platform/gdk" />
232 <project path="hardware/akm" name="platform/hardware/akm" />
233 <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" groups="broadcom_wlan" />
234 <project path="hardware/invensense" name="platform/hardware/invensense" groups="invensense" />
221 <project path="hardware/libhardware" name="platform/hardware/libhardware" groups="pdk" /> 235 <project path="hardware/libhardware" name="platform/hardware/libhardware" groups="pdk" />
222 <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" groups="pdk" /> 236 <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" groups="pdk" />
237 <project path="hardware/msm7k" name="platform/hardware/msm7k" />
238 <project path="hardware/qcom/audio" name="platform/hardware/qcom/audio" groups="qcom" />
239 <project path="hardware/qcom/bt" name="platform/hardware/qcom/bt" groups="qcom" />
240 <project path="hardware/qcom/camera" name="platform/hardware/qcom/camera" groups="qcom" />
241 <project path="hardware/qcom/display" name="platform/hardware/qcom/display" groups="qcom" />
242 <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" groups="qcom" />
243 <project path="hardware/qcom/keymaster" name="platform/hardware/qcom/keymaster" groups="qcom" />
244 <project path="hardware/qcom/media" name="platform/hardware/qcom/media" groups="qcom" />
245 <project path="hardware/qcom/msm8960" name="platform/hardware/qcom/msm8960" groups="qcom" />
246 <project path="hardware/qcom/power" name="platform/hardware/qcom/power" groups="qcom" />
247 <project path="hardware/qcom/sensors" name="platform/hardware/qcom/sensors" groups="qcom" />
248 <project path="hardware/qcom/wlan" name="platform/hardware/qcom/wlan" groups="qcom_wlan" />
223 <project path="hardware/ril" name="platform/hardware/ril" groups="pdk" /> 249 <project path="hardware/ril" name="platform/hardware/ril" groups="pdk" />
250 <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" groups="exynos5" />
251 <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
252 <project path="hardware/ti/omap4-aah" name="platform/hardware/ti/omap4-aah" groups="omap4-aah" />
253 <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" groups="omap4" />
254 <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
255 <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
224 <project path="libcore" name="platform/libcore" /> 256 <project path="libcore" name="platform/libcore" />
225 <project path="libnativehelper" name="platform/libnativehelper" groups="pdk-java" /> 257 <project path="libnativehelper" name="platform/libnativehelper" groups="pdk-java" />
226 <project path="ndk" name="platform/ndk" /> 258 <project path="ndk" name="platform/ndk" />