diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-01-11 15:44:56 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2010-01-11 15:45:45 -0800 |
commit | 87990d10528b7dd6d06ee8c1efa5a719629e1f20 (patch) | |
tree | 3a991f988e858f1ea08cb17c5ed3260f0e4f0306 | |
parent | 8f35c9084940e76818dde3658905423afe81d9b0 (diff) | |
parent | b5c3386ab12f3602daad67daf51e7cb0fd8becf6 (diff) | |
download | manifest-87990d10528b7dd6d06ee8c1efa5a719629e1f20.tar.gz |
Merge from eclair
Also delete files that had been merged from eclair by mistake
-rw-r--r-- | android-2.0_r1_snapshot.xml | 15 | ||||
-rw-r--r-- | android-sdk-2.0_r1_snapshot.xml | 15 | ||||
-rw-r--r-- | android-sdk-tools_r3_snapshot.xml | 15 | ||||
-rw-r--r-- | default.xml | 26 |
4 files changed, 26 insertions, 45 deletions
diff --git a/android-2.0_r1_snapshot.xml b/android-2.0_r1_snapshot.xml deleted file mode 100644 index c9525886f..000000000 --- a/android-2.0_r1_snapshot.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<manifest> - <remote name="korg" - fetch="git://android.git.kernel.org/" - review="review.source.android.com" /> - <default revision="android-2.0_r1_snapshot" - remote="korg" /> - - <project path="development" name="platform/development" /> - <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" /> - <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" /> - <project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" /> - <project path="external/qemu" name="platform/external/qemu" /> - <project path="external/webkit" name="platform/external/webkit" /> -</manifest> diff --git a/android-sdk-2.0_r1_snapshot.xml b/android-sdk-2.0_r1_snapshot.xml deleted file mode 100644 index c6e1a9c6a..000000000 --- a/android-sdk-2.0_r1_snapshot.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<manifest> - <remote name="korg" - fetch="git://android.git.kernel.org/" - review="review.source.android.com" /> - <default revision="android-sdk-2.0_r1_snapshot" - remote="korg" /> - - <project path="development" name="platform/development" /> - <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" /> - <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" /> - <project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" /> - <project path="external/qemu" name="platform/external/qemu" /> - <project path="external/webkit" name="platform/external/webkit" /> -</manifest> diff --git a/android-sdk-tools_r3_snapshot.xml b/android-sdk-tools_r3_snapshot.xml deleted file mode 100644 index e850e8256..000000000 --- a/android-sdk-tools_r3_snapshot.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<manifest> - <remote name="korg" - fetch="git://android.git.kernel.org/" - review="review.source.android.com" /> - <default revision="android-sdk-tools_r3_snapshot" - remote="korg" /> - - <project path="development" name="platform/development" /> - <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" /> - <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" /> - <project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" /> - <project path="external/qemu" name="platform/external/qemu" /> - <project path="external/webkit" name="platform/external/webkit" /> -</manifest> diff --git a/default.xml b/default.xml index 5037e6057..63aa12f45 100644 --- a/default.xml +++ b/default.xml @@ -23,11 +23,16 @@ <project path="frameworks/opt/com.google.android.googlelogin" name="platform/frameworks/opt/com.google.android.googlelogin" /> <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" /> <project path="frameworks/policies/base" name="platform/frameworks/policies/base" /> + <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" /> <project path="hardware/htc/dream" name="platform/hardware/htc/dream" /> <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/ril" name="platform/hardware/ril" /> + <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" /> + <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" /> + <project path="sdk" name="platform/sdk" /> + <project path="prebuilt" name="platform/prebuilt" /> <project path="system/bluetooth" name="platform/system/bluetooth" /> @@ -43,23 +48,31 @@ <project path="packages/providers/DrmProvider" name="platform/packages/providers/DrmProvider" /> <project path="packages/providers/GoogleContactsProvider" name="platform/packages/providers/GoogleContactsProvider" /> <project path="packages/providers/GoogleSubscribedFeedsProvider" name="platform/packages/providers/GoogleSubscribedFeedsProvider" /> + <project path="packages/providers/ImProvider" name="platform/packages/providers/ImProvider" /> + <project path="packages/providers/ManagementProvider" name="platform/packages/providers/ManagementProvider" /> <project path="packages/providers/MediaProvider" name="platform/packages/providers/MediaProvider" /> <project path="packages/providers/TelephonyProvider" name="platform/packages/providers/TelephonyProvider" /> <project path="packages/providers/UserDictionaryProvider" name="platform/packages/providers/UserDictionaryProvider" /> <project path="packages/providers/WebSearchProvider" name="platform/packages/providers/WebSearchProvider" /> <project path="packages/apps/AlarmClock" name="platform/packages/apps/AlarmClock" /> + <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" /> <project path="packages/apps/Browser" name="platform/packages/apps/Browser" /> <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" /> <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" /> <project path="packages/apps/Camera" name="platform/packages/apps/Camera" /> + <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" /> <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" /> + <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" /> <project path="packages/apps/Email" name="platform/packages/apps/Email" /> + <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" /> + <project path="packages/apps/Gallery3D" name="platform/packages/apps/Gallery3D" /> <project path="packages/apps/GlobalSearch" name="platform/packages/apps/GlobalSearch" /> <project path="packages/apps/GoogleSearch" name="platform/packages/apps/GoogleSearch" /> <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" /> <project path="packages/apps/IM" name="platform/packages/apps/IM" /> <project path="packages/apps/Launcher" name="platform/packages/apps/Launcher" /> + <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" /> <project path="packages/apps/Mms" name="platform/packages/apps/Mms" /> <project path="packages/apps/Music" name="platform/packages/apps/Music" /> <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" /> @@ -76,6 +89,14 @@ <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" /> <project path="packages/inputmethods/PinyinIME" name="platform/packages/inputmethods/PinyinIME" /> + <project path="packages/services/EasService" name="platform/packages/services/EasService" /> + <project path="packages/services/LockAndWipe" name="platform/packages/services/LockAndWipe" /> + + <project path="packages/wallpapers/Basic" name="platform/packages/wallpapers/Basic" /> + <project path="packages/wallpapers/LivePicker" name="platform/packages/wallpapers/LivePicker" /> + <project path="packages/wallpapers/MagicSmoke" name="platform/packages/wallpapers/MagicSmoke" /> + <project path="packages/wallpapers/MusicVisualization" name="platform/packages/wallpapers/MusicVisualization" /> + <project path="external/aes" name="platform/external/aes" /> <project path="external/apache-http" name="platform/external/apache-http" /> <project path="external/astl" name="platform/external/astl" /> @@ -89,6 +110,7 @@ <project path="external/clearsilver" name="platform/external/clearsilver" /> <project path="external/dbus" name="platform/external/dbus" /> <project path="external/dhcpcd" name="platform/external/dhcpcd" /> + <project path="external/dosfstools" name="platform/external/dosfstools" /> <project path="external/dropbear" name="platform/external/dropbear" /> <project path="external/e2fsprogs" name="platform/external/e2fsprogs" /> <project path="external/elfcopy" name="platform/external/elfcopy" /> @@ -125,9 +147,11 @@ <project path="external/neven" name="platform/external/neven" /> <project path="external/opencore" name="platform/external/opencore" /> <project path="external/openssl" name="platform/external/openssl" /> + <project path="external/openvpn" name="platform/external/openvpn" /> <project path="external/oprofile" name="platform/external/oprofile" /> <project path="external/ping" name="platform/external/ping" /> <project path="external/ppp" name="platform/external/ppp" /> + <project path="external/proguard" name="platform/external/proguard" /> <project path="external/protobuf" name="platform/external/protobuf" /> <project path="external/qemu" name="platform/external/qemu" /> <project path="external/safe-iop" name="platform/external/safe-iop" /> @@ -162,4 +186,6 @@ <project path="vendor/aosp" name="platform/vendor/aosp" /> <project path="vendor/sample" name="platform/vendor/sample" /> + + <project path="cts" name="platform/cts" /> </manifest> |