diff options
author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2012-03-20 12:43:01 +0530 |
---|---|---|
committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2012-03-20 12:43:01 +0530 |
commit | e952b9f8cf3d39949a4a7614adb5541d6822b3f7 (patch) | |
tree | d4bec5d54b70d719748dd65defcf2163d3d20c6d | |
parent | 1af1cef883131840ac35a373cc6eae5fd7292131 (diff) | |
parent | e8fe688bee2bdbb71fc648e14918fb15fc5c90ed (diff) | |
download | manifest-e952b9f8cf3d39949a4a7614adb5541d6822b3f7.tar.gz |
Merge remote-tracking branch 'remotes/origin/master' into linaro_android_master
-rw-r--r-- | default.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/default.xml b/default.xml index 5aeda614d..95b4f18e2 100644 --- a/default.xml +++ b/default.xml @@ -111,6 +111,8 @@ <project path="external/libpcap" name="platform/external/libpcap" /> <project path="external/libphonenumber" name="platform/external/libphonenumber" /> <project path="external/libpng" name="platform/external/libpng" /> + <project path="external/libselinux" name="platform/external/libselinux" /> + <project path="external/libsepol" name="platform/external/libsepol" /> <project path="external/libusb" name="platform/external/libusb" /> <project path="external/libusb-compat" name="platform/external/libusb-compat" /> <project path="external/libvpx" name="platform/external/libvpx" /> @@ -141,7 +143,9 @@ <project path="external/qemu" name="platform/external/qemu" /> <project path="external/qemu-pc-bios" name="platform/external/qemu-pc-bios" /> <project path="external/quake" name="platform/external/quake" /> + <project path="external/replicaisland" name="platform/external/replicaisland" /> <project path="external/safe-iop" name="platform/external/safe-iop" /> + <project path="external/sepolicy" name="platform/external/sepolicy" /> <project path="external/skia" name="platform/external/skia" /> <project path="external/sonivox" name="platform/external/sonivox" /> <project path="external/speex" name="platform/external/speex" /> @@ -191,6 +195,7 @@ <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" /> <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" /> <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" /> + <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" /> <project path="libcore" name="platform/libcore" /> <project path="ndk" name="platform/ndk" /> <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" /> |