diff options
author | The Android Open Source Project | 2012-11-13 14:46:35 -0600 |
---|---|---|
committer | The Android Open Source Project | 2012-11-13 14:46:48 -0600 |
commit | 43545df9292383471a1ccc7b4382be2198ded02b (patch) | |
tree | b0cd82110fbede84ab480ea5a9769e159ce793a2 | |
parent | 00ee1ab4c9bfe7ef72aab6abce27bdf0b17e3426 (diff) | |
parent | cb5004d3709a4bb0764b777ba1787677860ce714 (diff) | |
download | platform-manifest-43545df9292383471a1ccc7b4382be2198ded02b.tar.gz platform-manifest-43545df9292383471a1ccc7b4382be2198ded02b.tar.xz platform-manifest-43545df9292383471a1ccc7b4382be2198ded02b.zip |
Merge from master
Change-Id: I913f2fb5c4974685f2ebf34d3aa5afb9d8f82980
-rw-r--r-- | default.xml | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/default.xml b/default.xml index 81ef5ca..3e56b51 100644 --- a/default.xml +++ b/default.xml | |||
@@ -8,7 +8,7 @@ | |||
8 | remote="aosp" | 8 | remote="aosp" |
9 | sync-j="4" /> | 9 | sync-j="4" /> |
10 | 10 | ||
11 | <project path="build" name="platform/build"> | 11 | <project path="build" name="platform/build" > |
12 | <copyfile src="core/root.mk" dest="Makefile" /> | 12 | <copyfile src="core/root.mk" dest="Makefile" /> |
13 | </project> | 13 | </project> |
14 | <project path="abi/cpp" name="platform/abi/cpp" /> | 14 | <project path="abi/cpp" name="platform/abi/cpp" /> |
@@ -20,24 +20,24 @@ | |||
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" /> | 22 | <project path="device/asus/grouper" name="device/asus/grouper" groups="device" /> |
23 | <project path="device/asus/tilapia" name="device/asus/tilapia" groups="device" /> | ||
23 | <project path="device/common" name="device/common" /> | 24 | <project path="device/common" name="device/common" /> |
24 | <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" /> | 25 | <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" /> |
25 | <project path="device/generic/armv7-a" name="device/generic/armv7-a" /> | 26 | <project path="device/generic/armv7-a" name="device/generic/armv7-a" /> |
27 | <project path="device/generic/common" name="device/generic/common" /> | ||
26 | <project path="device/generic/goldfish" name="device/generic/goldfish" /> | 28 | <project path="device/generic/goldfish" name="device/generic/goldfish" /> |
29 | <project path="device/generic/mips" name="device/generic/mips" /> | ||
30 | <project path="device/generic/x86" name="device/generic/x86" /> | ||
27 | <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" /> |
28 | <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" /> |
29 | <project path="device/google/phantasm" name="device/google/phantasm" groups="device" /> | 33 | <project path="device/google/phantasm" name="device/google/phantasm" groups="device" /> |
30 | <project path="device/moto/common" name="device/moto/common" groups="device" /> | ||
31 | <project path="device/moto/stingray" name="device/moto/stingray" groups="device" /> | ||
32 | <project path="device/moto/wingray" name="device/moto/wingray" groups="device" /> | ||
33 | <project path="device/sample" name="device/sample" /> | 34 | <project path="device/sample" name="device/sample" /> |
34 | <project path="device/samsung/crespo" name="device/samsung/crespo" groups="device" /> | ||
35 | <project path="device/samsung/crespo4g" name="device/samsung/crespo4g" groups="device" /> | ||
36 | <project path="device/samsung/maguro" name="device/samsung/maguro" groups="device" /> | 35 | <project path="device/samsung/maguro" name="device/samsung/maguro" groups="device" /> |
36 | <project path="device/samsung/manta" name="device/samsung/manta" groups="device" /> | ||
37 | <project path="device/samsung/toro" name="device/samsung/toro" groups="device" /> | 37 | <project path="device/samsung/toro" name="device/samsung/toro" groups="device" /> |
38 | <project path="device/samsung/toroplus" name="device/samsung/toroplus" groups="device" /> | 38 | <project path="device/samsung/toroplus" name="device/samsung/toroplus" groups="device" /> |
39 | <project path="device/samsung/tuna" name="device/samsung/tuna" groups="device" /> | 39 | <project path="device/samsung/tuna" name="device/samsung/tuna" groups="device" /> |
40 | <project path="device/sony/lt26" name="device/sony/lt26" groups="device" /> | 40 | <project path="device/samsung_slsi/arndale" name="device/samsung_slsi/arndale" groups="device" /> |
41 | <project path="device/ti/panda" name="device/ti/panda" groups="device" /> | 41 | <project path="device/ti/panda" name="device/ti/panda" groups="device" /> |
42 | <project path="docs/source.android.com" name="platform/docs/source.android.com" /> | 42 | <project path="docs/source.android.com" name="platform/docs/source.android.com" /> |
43 | <project path="external/aac" name="platform/external/aac" /> | 43 | <project path="external/aac" name="platform/external/aac" /> |
@@ -53,9 +53,7 @@ | |||
53 | <project path="external/astl" name="platform/external/astl" /> | 53 | <project path="external/astl" name="platform/external/astl" /> |
54 | <project path="external/bison" name="platform/external/bison" /> | 54 | <project path="external/bison" name="platform/external/bison" /> |
55 | <project path="external/blktrace" name="platform/external/blktrace" /> | 55 | <project path="external/blktrace" name="platform/external/blktrace" /> |
56 | <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" /> | 56 | <project path="external/bluetooth/bluedroid" name="platform/external/bluetooth/bluedroid" /> |
57 | <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" /> | ||
58 | <project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" /> | ||
59 | <project path="external/bouncycastle" name="platform/external/bouncycastle" /> | 57 | <project path="external/bouncycastle" name="platform/external/bouncycastle" /> |
60 | <project path="external/bsdiff" name="platform/external/bsdiff" /> | 58 | <project path="external/bsdiff" name="platform/external/bsdiff" /> |
61 | <project path="external/bzip2" name="platform/external/bzip2" /> | 59 | <project path="external/bzip2" name="platform/external/bzip2" /> |
@@ -114,19 +112,24 @@ | |||
114 | <project path="external/jsr305" name="platform/external/jsr305" /> | 112 | <project path="external/jsr305" name="platform/external/jsr305" /> |
115 | <project path="external/junit" name="platform/external/junit" /> | 113 | <project path="external/junit" name="platform/external/junit" /> |
116 | <project path="external/kernel-headers" name="platform/external/kernel-headers" /> | 114 | <project path="external/kernel-headers" name="platform/external/kernel-headers" /> |
115 | <project path="external/libcap-ng" name="platform/external/libcap-ng" /> | ||
117 | <project path="external/libffi" name="platform/external/libffi" /> | 116 | <project path="external/libffi" name="platform/external/libffi" /> |
118 | <project path="external/libgsm" name="platform/external/libgsm" /> | 117 | <project path="external/libgsm" name="platform/external/libgsm" /> |
119 | <project path="external/liblzf" name="platform/external/liblzf" /> | 118 | <project path="external/liblzf" name="platform/external/liblzf" /> |
120 | <project path="external/libmtp" name="platform/external/libmtp" /> | 119 | <project path="external/libmtp" name="platform/external/libmtp" /> |
120 | <project path="external/libnfc-nci" name="platform/external/libnfc-nci" /> | ||
121 | <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" /> | 121 | <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" /> |
122 | <project path="external/libnl-headers" name="platform/external/libnl-headers" /> | 122 | <project path="external/libnl-headers" name="platform/external/libnl-headers" /> |
123 | <project path="external/libogg" name="platform/external/libogg" /> | ||
123 | <project path="external/libpcap" name="platform/external/libpcap" /> | 124 | <project path="external/libpcap" name="platform/external/libpcap" /> |
124 | <project path="external/libphonenumber" name="platform/external/libphonenumber" /> | 125 | <project path="external/libphonenumber" name="platform/external/libphonenumber" /> |
125 | <project path="external/libpng" name="platform/external/libpng" /> | 126 | <project path="external/libpng" name="platform/external/libpng" /> |
127 | <project path="external/libppp" name="platform/external/libppp" /> | ||
126 | <project path="external/libselinux" name="platform/external/libselinux" /> | 128 | <project path="external/libselinux" name="platform/external/libselinux" /> |
127 | <project path="external/libsepol" name="platform/external/libsepol" /> | 129 | <project path="external/libsepol" name="platform/external/libsepol" /> |
128 | <project path="external/libusb" name="platform/external/libusb" /> | 130 | <project path="external/libusb" name="platform/external/libusb" /> |
129 | <project path="external/libusb-compat" name="platform/external/libusb-compat" /> | 131 | <project path="external/libusb-compat" name="platform/external/libusb-compat" /> |
132 | <project path="external/libvorbis" name="platform/external/libvorbis" /> | ||
130 | <project path="external/libvpx" name="platform/external/libvpx" /> | 133 | <project path="external/libvpx" name="platform/external/libvpx" /> |
131 | <project path="external/libxml2" name="platform/external/libxml2" /> | 134 | <project path="external/libxml2" name="platform/external/libxml2" /> |
132 | <project path="external/libxslt" name="platform/external/libxslt" /> | 135 | <project path="external/libxslt" name="platform/external/libxslt" /> |
@@ -140,6 +143,7 @@ | |||
140 | <project path="external/mesa3d" name="platform/external/mesa3d" /> | 143 | <project path="external/mesa3d" name="platform/external/mesa3d" /> |
141 | <project path="external/mksh" name="platform/external/mksh" /> | 144 | <project path="external/mksh" name="platform/external/mksh" /> |
142 | <project path="external/mockwebserver" name="platform/external/mockwebserver" /> | 145 | <project path="external/mockwebserver" name="platform/external/mockwebserver" /> |
146 | <project path="external/mp4parser" name="platform/external/mp4parser" /> | ||
143 | <project path="external/mtpd" name="platform/external/mtpd" /> | 147 | <project path="external/mtpd" name="platform/external/mtpd" /> |
144 | <project path="external/naver-fonts" name="platform/external/naver-fonts" /> | 148 | <project path="external/naver-fonts" name="platform/external/naver-fonts" /> |
145 | <project path="external/netcat" name="platform/external/netcat" /> | 149 | <project path="external/netcat" name="platform/external/netcat" /> |
@@ -180,6 +184,7 @@ | |||
180 | <project path="external/tcpdump" name="platform/external/tcpdump" /> | 184 | <project path="external/tcpdump" name="platform/external/tcpdump" /> |
181 | <project path="external/tinyalsa" name="platform/external/tinyalsa" /> | 185 | <project path="external/tinyalsa" name="platform/external/tinyalsa" /> |
182 | <project path="external/tinyxml" name="platform/external/tinyxml" /> | 186 | <project path="external/tinyxml" name="platform/external/tinyxml" /> |
187 | <project path="external/tinyxml2" name="platform/external/tinyxml2" /> | ||
183 | <project path="external/tremolo" name="platform/external/tremolo" /> | 188 | <project path="external/tremolo" name="platform/external/tremolo" /> |
184 | <project path="external/v8" name="platform/external/v8" /> | 189 | <project path="external/v8" name="platform/external/v8" /> |
185 | <project path="external/valgrind" name="platform/external/valgrind" /> | 190 | <project path="external/valgrind" name="platform/external/valgrind" /> |
@@ -189,6 +194,7 @@ | |||
189 | <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" /> | 194 | <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" /> |
190 | <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" /> | 195 | <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" /> |
191 | <project path="external/xmlwriter" name="platform/external/xmlwriter" /> | 196 | <project path="external/xmlwriter" name="platform/external/xmlwriter" /> |
197 | <project path="external/xmp_toolkit" name="platform/external/xmp_toolkit" /> | ||
192 | <project path="external/yaffs2" name="platform/external/yaffs2" /> | 198 | <project path="external/yaffs2" name="platform/external/yaffs2" /> |
193 | <project path="external/zlib" name="platform/external/zlib" /> | 199 | <project path="external/zlib" name="platform/external/zlib" /> |
194 | <project path="external/zxing" name="platform/external/zxing" /> | 200 | <project path="external/zxing" name="platform/external/zxing" /> |
@@ -196,6 +202,7 @@ | |||
196 | <project path="frameworks/base" name="platform/frameworks/base" /> | 202 | <project path="frameworks/base" name="platform/frameworks/base" /> |
197 | <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" /> | 203 | <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" /> |
198 | <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" /> | 204 | <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" /> |
205 | <project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" /> | ||
199 | <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" /> | 206 | <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" /> |
200 | <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" /> | 207 | <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" /> |
201 | <project path="frameworks/ex" name="platform/frameworks/ex" /> | 208 | <project path="frameworks/ex" name="platform/frameworks/ex" /> |
@@ -208,6 +215,7 @@ | |||
208 | <project path="frameworks/opt/inputmethodcommon" name="platform/frameworks/opt/inputmethodcommon" /> | 215 | <project path="frameworks/opt/inputmethodcommon" name="platform/frameworks/opt/inputmethodcommon" /> |
209 | <project path="frameworks/opt/mailcommon" name="platform/frameworks/opt/mailcommon" /> | 216 | <project path="frameworks/opt/mailcommon" name="platform/frameworks/opt/mailcommon" /> |
210 | <project path="frameworks/opt/mms" name="platform/frameworks/opt/mms" /> | 217 | <project path="frameworks/opt/mms" name="platform/frameworks/opt/mms" /> |
218 | <project path="frameworks/opt/photoviewer" name="platform/frameworks/opt/photoviewer" /> | ||
211 | <project path="frameworks/opt/telephony" name="platform/frameworks/opt/telephony" /> | 219 | <project path="frameworks/opt/telephony" name="platform/frameworks/opt/telephony" /> |
212 | <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" /> | 220 | <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" /> |
213 | <project path="frameworks/rs" name="platform/frameworks/rs" /> | 221 | <project path="frameworks/rs" name="platform/frameworks/rs" /> |
@@ -221,11 +229,10 @@ | |||
221 | <project path="hardware/invensense" name="platform/hardware/invensense" /> | 229 | <project path="hardware/invensense" name="platform/hardware/invensense" /> |
222 | <project path="hardware/libhardware" name="platform/hardware/libhardware" /> | 230 | <project path="hardware/libhardware" name="platform/hardware/libhardware" /> |
223 | <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" /> | 231 | <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" /> |
224 | <project path="hardware/msm7k" name="platform/hardware/msm7k" /> | ||
225 | <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" /> | ||
226 | <project path="hardware/qcom/media" name="platform/hardware/qcom/media" /> | ||
227 | <project path="hardware/ril" name="platform/hardware/ril" /> | 232 | <project path="hardware/ril" name="platform/hardware/ril" /> |
233 | <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" /> | ||
228 | <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" /> | 234 | <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" /> |
235 | <project path="hardware/ti/omap4-aah" name="platform/hardware/ti/omap4-aah" /> | ||
229 | <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" /> | 236 | <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" /> |
230 | <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" /> | 237 | <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" /> |
231 | <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" /> | 238 | <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" /> |
@@ -281,6 +288,9 @@ | |||
281 | <project path="packages/providers/PartnerBookmarksProvider" name="platform/packages/providers/PartnerBookmarksProvider" /> | 288 | <project path="packages/providers/PartnerBookmarksProvider" name="platform/packages/providers/PartnerBookmarksProvider" /> |
282 | <project path="packages/providers/TelephonyProvider" name="platform/packages/providers/TelephonyProvider" /> | 289 | <project path="packages/providers/TelephonyProvider" name="platform/packages/providers/TelephonyProvider" /> |
283 | <project path="packages/providers/UserDictionaryProvider" name="platform/packages/providers/UserDictionaryProvider" /> | 290 | <project path="packages/providers/UserDictionaryProvider" name="platform/packages/providers/UserDictionaryProvider" /> |
291 | <project path="packages/screensavers/Basic" name="platform/packages/screensavers/Basic" /> | ||
292 | <project path="packages/screensavers/PhotoTable" name="platform/packages/screensavers/PhotoTable" /> | ||
293 | <project path="packages/screensavers/WebView" name="platform/packages/screensavers/WebView" /> | ||
284 | <project path="packages/wallpapers/Basic" name="platform/packages/wallpapers/Basic" /> | 294 | <project path="packages/wallpapers/Basic" name="platform/packages/wallpapers/Basic" /> |
285 | <project path="packages/wallpapers/Galaxy4" name="platform/packages/wallpapers/Galaxy4" /> | 295 | <project path="packages/wallpapers/Galaxy4" name="platform/packages/wallpapers/Galaxy4" /> |
286 | <project path="packages/wallpapers/HoloSpiral" name="platform/packages/wallpapers/HoloSpiral" /> | 296 | <project path="packages/wallpapers/HoloSpiral" name="platform/packages/wallpapers/HoloSpiral" /> |
@@ -290,6 +300,10 @@ | |||
290 | <project path="packages/wallpapers/NoiseField" name="platform/packages/wallpapers/NoiseField" /> | 300 | <project path="packages/wallpapers/NoiseField" name="platform/packages/wallpapers/NoiseField" /> |
291 | <project path="packages/wallpapers/PhaseBeam" name="platform/packages/wallpapers/PhaseBeam" /> | 301 | <project path="packages/wallpapers/PhaseBeam" name="platform/packages/wallpapers/PhaseBeam" /> |
292 | <project path="pdk" name="platform/pdk" /> | 302 | <project path="pdk" name="platform/pdk" /> |
303 | <project path="prebuilts/clang/darwin-x86/3.1" name="platform/prebuilts/clang/darwin-x86/3.1" groups="darwin" /> | ||
304 | <project path="prebuilts/clang/darwin-x86/3.2" name="platform/prebuilts/clang/darwin-x86/3.2" groups="darwin" /> | ||
305 | <project path="prebuilts/clang/linux-x86/3.1" name="platform/prebuilts/clang/linux-x86/3.1" groups="linux" /> | ||
306 | <project path="prebuilts/clang/linux-x86/3.2" name="platform/prebuilts/clang/linux-x86/3.2" groups="linux" /> | ||
293 | <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" /> | 307 | <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" /> |
294 | <project path="prebuilts/eclipse-build-deps" name="platform/prebuilts/eclipse-build-deps" groups="notdefault,eclipse" /> | 308 | <project path="prebuilts/eclipse-build-deps" name="platform/prebuilts/eclipse-build-deps" groups="notdefault,eclipse" /> |
295 | <project path="prebuilts/eclipse-build-deps-sources" name="platform/prebuilts/eclipse-build-deps-sources" groups="notdefault,eclipse" /> | 309 | <project path="prebuilts/eclipse-build-deps-sources" name="platform/prebuilts/eclipse-build-deps-sources" groups="notdefault,eclipse" /> |