Merge from master

Change-Id: Ib0e2fa7922857bd60e51ed7701fe640868ad07e6

diff --cc default.xml
index 92c41b9,6e0cbdc..079bc3a
--- 1/default.xml
--- 2/default.xml
+++ b/default.xml
@@@ -8,37 -8,37 +8,37 @@@
             remote="aosp"
             sync-j="4" />
  
-   <project path="build" name="platform/build" >
+   <project path="build" name="platform/build" groups="pdk" >
      <copyfile src="core/root.mk" dest="Makefile" />
    </project>
-   <project path="abi/cpp" name="platform/abi/cpp" />
-   <project path="bionic" name="platform/bionic" />
+   <project path="abi/cpp" name="platform/abi/cpp" groups="pdk" />
+   <project path="bionic" name="platform/bionic" groups="pdk" />
    <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
    <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-   <project path="bootable/recovery" name="platform/bootable/recovery" />
+   <project path="bootable/recovery" name="platform/bootable/recovery" groups="pdk" />
    <project path="cts" name="platform/cts" />
 -  <project path="dalvik" name="platform/dalvik2" />
 +  <project path="dalvik" name="platform/dalvik" />
    <project path="development" name="platform/development" />
-   <project path="device/asus/grouper" name="device/asus/grouper" groups="device" />
-   <project path="device/asus/tilapia" name="device/asus/tilapia" groups="device" />
+   <project path="device/asus/grouper" name="device/asus/grouper" groups="device,grouper" />
+   <project path="device/asus/tilapia" name="device/asus/tilapia" groups="device,grouper" />
    <project path="device/common" name="device/common" />
-   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
-   <project path="device/generic/armv7-a" name="device/generic/armv7-a" />
-   <project path="device/generic/common" name="device/generic/common" />
-   <project path="device/generic/goldfish" name="device/generic/goldfish" />
-   <project path="device/generic/mips" name="device/generic/mips" />
-   <project path="device/generic/x86" name="device/generic/x86" />
+   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" groups="pdk" />
+   <project path="device/generic/armv7-a" name="device/generic/armv7-a" groups="pdk" />
+   <project path="device/generic/common" name="device/generic/common" groups="pdk" />
+   <project path="device/generic/goldfish" name="device/generic/goldfish" groups="pdk" />
+   <project path="device/generic/mips" name="device/generic/mips" groups="pdk" />
+   <project path="device/generic/x86" name="device/generic/x86" groups="pdk" />
    <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" />
-   <project path="device/samsung/toro" name="device/samsung/toro" groups="device" />
-   <project path="device/samsung/toroplus" name="device/samsung/toroplus" groups="device" />
-   <project path="device/samsung/tuna" name="device/samsung/tuna" groups="device" />
+   <project path="device/google/phantasm" name="device/google/phantasm" groups="device,phantasm" />
+   <project path="device/lge/mako" name="device/lge/mako" groups="device,mako" />
+   <project path="device/lge/mako-kernel" name="device/lge/mako-kernel" groups="device,mako" />
+   <project path="device/sample" name="device/sample" groups="pdk" />
+   <project path="device/samsung/maguro" name="device/samsung/maguro" groups="device,tuna" />
+   <project path="device/samsung/manta" name="device/samsung/manta" groups="device,manta" />
+   <project path="device/samsung/toro" name="device/samsung/toro" groups="device,tuna" />
+   <project path="device/samsung/toroplus" name="device/samsung/toroplus" groups="device,tuna" />
+   <project path="device/samsung/tuna" name="device/samsung/tuna" groups="device,tuna" />
    <project path="device/samsung_slsi/arndale" name="device/samsung_slsi/arndale" groups="device" />
    <project path="device/ti/panda" name="device/ti/panda" groups="device" />
    <project path="docs/source.android.com" name="platform/docs/source.android.com" />
@@@ -228,31 -228,31 +228,31 @@@
    <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" />
    <project path="gdk" name="platform/gdk" />
    <project path="hardware/akm" name="platform/hardware/akm" />
-   <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
-   <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/broadcom/wlan" name="platform/hardware/broadcom/wlan" groups="broadcom_wlan" />
+   <project path="hardware/invensense" name="platform/hardware/invensense" groups="invensense" />
+   <project path="hardware/libhardware" name="platform/hardware/libhardware" groups="pdk" />
+   <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" groups="pdk" />
    <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/qcom/audio" name="platform/hardware/qcom/audio" groups="qcom" />
+   <project path="hardware/qcom/bt" name="platform/hardware/qcom/bt" groups="qcom" />
+   <project path="hardware/qcom/camera" name="platform/hardware/qcom/camera" groups="qcom" />
+   <project path="hardware/qcom/display" name="platform/hardware/qcom/display" groups="qcom" />
+   <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" groups="qcom" />
+   <project path="hardware/qcom/keymaster" name="platform/hardware/qcom/keymaster" groups="qcom" />
+   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" groups="qcom" />
+   <project path="hardware/qcom/msm8960" name="platform/hardware/qcom/msm8960" groups="qcom" />
+   <project path="hardware/qcom/power" name="platform/hardware/qcom/power" groups="qcom" />
+   <project path="hardware/qcom/sensors" name="platform/hardware/qcom/sensors" groups="qcom" />
+   <project path="hardware/qcom/wlan" name="platform/hardware/qcom/wlan" groups="qcom_wlan" />
+   <project path="hardware/ril" name="platform/hardware/ril" groups="pdk" />
+   <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" groups="exynos5" />
    <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
-   <project path="hardware/ti/omap4-aah" name="platform/hardware/ti/omap4-aah" />
-   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" />
+   <project path="hardware/ti/omap4-aah" name="platform/hardware/ti/omap4-aah" groups="omap4-aah" />
+   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" groups="omap4" />
    <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/libcore2" />
 +  <project path="libcore" name="platform/libcore" />
-   <project path="libnativehelper" name="platform/libnativehelper" />
+   <project path="libnativehelper" name="platform/libnativehelper" groups="pdk-java" />
    <project path="ndk" name="platform/ndk" />
    <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
    <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" />