Manifest for Studio 2.2 Preview 3.

1 files changed, 24 insertions, 79 deletions

diff --git a/default.xml b/default.xml
index 2eaf281c2..46f3ea36c 100644
--- a/default.xml
+++ b/default.xml
@@ -9,86 +9,31 @@
            sync-j="4" />
 
   <project path="tools/buildSrc" name="platform/tools/buildSrc">
-    <copyfile src="base/build.gradle" dest="tools/build.gradle" />
-    <copyfile src="base/settings.gradle" dest="tools/settings.gradle" />
-    <copyfile src="base/gradlew" dest="tools/gradlew" />
-    <copyfile src="base/gradlew.bat" dest="tools/gradlew.bat" />
-    <copyfile src="base/gradle.properties" dest="tools/gradle.properties" />
+    <copyfile src="base/build.gradle" dest="tools/build.gradle"/>
+    <copyfile src="base/settings.gradle" dest="tools/settings.gradle"/>
+    <copyfile src="base/gradlew" dest="tools/gradlew"/>
+    <copyfile src="base/gradlew.bat" dest="tools/gradlew.bat"/>
+    <copyfile src="base/gradle.properties" dest="tools/gradle.properties"/>
   </project>
 
-  <project path="external/ant-glob" name="platform/external/ant-glob" />
-  <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" />
-  <project path="external/emma" name="platform/external/emma" />
-  <project path="external/gmock" name="platform/external/gmock" groups="gpu" />
-  <project path="external/iosched" name="platform/external/iosched" />
-  <project path="external/protobuf" name="platform/external/protobuf" />
-  <project path="external/gtest" name="platform/external/gtest" />
-  <project path="frameworks/native" name="platform/frameworks/native" />
-  <project path="prebuilts/clang/darwin-x86/host/3.5" name="platform/prebuilts/clang/darwin-x86/host/3.5" groups="gpu,notdefault,platform-darwin" />
-  <project path="prebuilts/clang/darwin-x86/sdk/3.5" name="platform/prebuilts/clang/darwin-x86/sdk/3.5" />
-  <project path="prebuilts/clang/linux-x86/host/3.6" name="platform/prebuilts/clang/linux-x86/host/3.6" clone-depth="1" groups="lldb,notdefault,linux" />
-  <project path="prebuilts/cmake/darwin-x86" name="platform/prebuilts/cmake/darwin-x86" clone-depth="1" groups="lldb,notdefault,darwin" />
-  <project path="prebuilts/cmake/linux-x86" name="platform/prebuilts/cmake/linux-x86" clone-depth="1" groups="lldb,notdefault,linux" />
-  <project path="prebuilts/cmake/windows-x86" name="platform/prebuilts/cmake/windows-x86" clone-depth="1" groups="lldb,notdefault,windows" />
-  <project path="prebuilts/eclipse-build-deps" name="platform/prebuilts/eclipse-build-deps" />
-  <project path="prebuilts/eclipse-build-deps-sources" name="platform/prebuilts/eclipse-build-deps-sources" />
-  <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" />
-  <project path="prebuilts/maven_repo/android" name="platform/prebuilts/maven_repo/android" />
-  <project path="prebuilts/fullsdk/darwin/build-tools/21-darwin" name="platform/prebuilts/fullsdk/build-tools/21-darwin" clone-depth="1" groups="gpu,notdefault,platform-darwin" />
-  <project path="prebuilts/fullsdk/darwin/platforms/android-21" name="platform/prebuilts/fullsdk/platforms/android-21" clone-depth="1" groups="gpu,notdefault,platform-darwin" />
-  <project path="prebuilts/fullsdk/linux/build-tools/21-linux" name="platform/prebuilts/fullsdk/build-tools/21-linux" clone-depth="1" groups="gpu,notdefault,platform-linux" />
-  <project path="prebuilts/fullsdk/linux/platforms/android-21" name="platform/prebuilts/fullsdk/platforms/android-21" clone-depth="1" groups="gpu,notdefault,platform-linux" />
-  <project path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" clone-depth="1" groups="gpu,notdefault,platform-darwin" />
-  <project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" clone-depth="1" groups="gpu,notdefault,platform-darwin" />
-  <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" clone-depth="1" groups="gpu,notdefault,platform-linux" />
-  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" clone-depth="1" groups="gpu,notdefault,platform-linux" />
-  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" />
-  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" />
-  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" clone-depth="1" groups="lldb,notdefault,linux" />
-  <project path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" />
-  <project path="prebuilts/go/linux-x86" name="platform/prebuilts/go/linux-x86" groups="gpu,notdefault,platform-linux" />
-  <project path="prebuilts/go/darwin-x86" name="platform/prebuilts/go/darwin-x86" groups="gpu,notdefault,platform-darwin" />
-  <project path="prebuilts/go/windows-x86" name="platform/prebuilts/go/windows-x86" groups="gpu,notdefault,platform-windows" />
-  <project path="prebuilts/google-breakpad/darwin-x86" name="platform/prebuilts/google-breakpad/darwin-x86" clone-depth="1" groups="lldb,notdefault,darwin" />
-  <project path="prebuilts/google-breakpad/linux-x86" name="platform/prebuilts/google-breakpad/linux-x86" clone-depth="1" groups="lldb,notdefault,linux" />
-  <project path="prebuilts/google-breakpad/windows-x86" name="platform/prebuilts/google-breakpad/windows-x86" clone-depth="1" groups="lldb,notdefault,windows" />
-  <project path="prebuilts/libedit/darwin-x86" name="platform/prebuilts/libedit/darwin-x86" clone-depth="1" groups="lldb,notdefault,darwin" />
-  <project path="prebuilts/libedit/linux-x86" name="platform/prebuilts/libedit/linux-x86" clone-depth="1" groups="lldb,notdefault,linux" />
-  <project path="prebuilts/libglog/darwin-x86" name="platform/prebuilts/libglog/darwin-x86" clone-depth="1" groups="lldb,notdefault,darwin" />
-  <project path="prebuilts/libglog/linux-x86" name="platform/prebuilts/libglog/linux-x86" clone-depth="1" groups="lldb,notdefault,linux" />
-  <project path="prebuilts/libglog/windows-x86" name="platform/prebuilts/libglog/windows-x86" clone-depth="1" groups="lldb,notdefault,windows" />
-  <project path="prebuilts/libprotobuf/darwin-x86" name="platform/prebuilts/libprotobuf/darwin-x86" clone-depth="1" groups="lldb,notdefault,darwin" />
-  <project path="prebuilts/libprotobuf/linux-x86" name="platform/prebuilts/libprotobuf/linux-x86" clone-depth="1" groups="lldb,notdefault,linux" />
-  <project path="prebuilts/libprotobuf/windows-x86" name="platform/prebuilts/libprotobuf/windows-x86" clone-depth="1" groups="lldb,notdefault,windows" />
-  <project path="prebuilts/ndk" name="platform/prebuilts/ndk" clone-depth="1" groups="gpu" />
-  <project path="prebuilts/ninja/darwin-x86" name="platform/prebuilts/ninja/darwin-x86" clone-depth="1" groups="lldb,notdefault,darwin" />
-  <project path="prebuilts/ninja/linux-x86" name="platform/prebuilts/ninja/linux-x86" clone-depth="1" groups="lldb,notdefault,linux" />
-  <project path="prebuilts/ninja/windows-x86" name="platform/prebuilts/ninja/windows-x86" clone-depth="1" groups="lldb,notdefault,windows" />
-  <project path="prebuilts/python/linux-x86" name="platform/prebuilts/python/linux-x86" clone-depth="1" groups="lldb,notdefault,linux" />
-  <project path="prebuilts/python/windows-x86" name="platform/prebuilts/python/windows-x86" clone-depth="1" groups="lldb,notdefault,windows" />
-  <project path="prebuilts/studio/jdk" name="platform/prebuilts/studio/jdk" clone-depth="1" />
-  <project path="prebuilts/swig/darwin-x86" name="platform/prebuilts/swig/darwin-x86" clone-depth="1" groups="lldb,notdefault,darwin" />
-  <project path="prebuilts/swig/linux-x86" name="platform/prebuilts/swig/linux-x86" clone-depth="1" groups="lldb,notdefault,linux" />
-  <project path="prebuilts/swig/windows-x86" name="platform/prebuilts/swig/windows-x86" clone-depth="1" groups="lldb,notdefault,windows" />
-  <project path="prebuilts/tools" name="platform/prebuilts/tools" />
-  <project path="sdk" name="platform/sdk" />
-  <project path="tools/adt/eclipse" name="platform/tools/adt/eclipse" />
-  <project path="tools/adt/idea" name="platform/tools/adt/idea" />
-  <project path="tools/base" name="platform/tools/base" />
-  <project path="tools/data-binding" name="platform/frameworks/data-binding" />
-  <project path="tools/external/fat32lib" name="platform/tools/external/fat32lib" />
-  <project path="tools/external/gradle" name="platform/tools/external/gradle" />
-  <project path="tools/gpu/src/golang.org/x/net" name="platform/tools/external/go/src/golang.org/x/net" groups="gpu" />
-  <project path="tools/gpu/src/golang.org/x/tools" name="platform/tools/external/go/src/golang.org/x/tools" groups="gpu" />
-  <project path="tools/gpu/src/android.googlesource.com/platform/tools/gpu" name="platform/tools/gpu" groups="gpu" />
-  <project path="tools/gradle" name="platform/tools/gradle" />
-  <project path="tools/idea" name="platform/tools/idea" />
-  <project path="tools/studio/google/cloud/tools" name="platform/tools/studio/google/cloud/tools" />
-  <project path="tools/studio/google/cloud/testing" name="platform/tools/studio/google/cloud/testing" />
-  <project path="tools/studio/google/login" name="platform/tools/studio/google/login" />
-  <project path="tools/studio/google/play" name="platform/tools/studio/google/play" />
-  <project path="tools/studio/google/services" name="platform/tools/studio/google/services" />
-  <project path="tools/studio/google/appindexing" name="platform/tools/studio/google/appindexing" />
-  <project path="tools/swt" name="platform/tools/swt" />
+  <project path="prebuilts/studio/layoutlib" name="platform/prebuilts/studio/layoutlib" clone-depth="1"/>
+  <project path="prebuilts/tools" name="platform/prebuilts/tools"/>
+  <project path="sdk" name="platform/sdk"/>
+  <project path="tools/adt/idea" name="platform/tools/adt/idea"/>
+  <project path="tools/base" name="platform/tools/base"/>
+  <project path="tools/data-binding" name="platform/frameworks/data-binding"/>
+  <project path="tools/external/fat32lib" name="platform/tools/external/fat32lib"/>
+  <project path="tools/external/gradle" name="platform/tools/external/gradle"/>
+  <project path="tools/gpu/src/android.googlesource.com/platform/tools/gpu" name="platform/tools/gpu" groups="gpu"/>
+  <project path="tools/gradle" name="platform/tools/gradle"/>
+  <project path="tools/idea" name="platform/tools/idea"/>
+  <project path="tools/sherpa" name="platform/frameworks/opt/sherpa"/>
+  <project path="tools/studio/google/cloud/tools" name="platform/tools/studio/google/cloud/tools"/>
+  <project path="tools/studio/google/cloud/testing" name="platform/tools/studio/google/cloud/testing"/>
+  <project path="tools/studio/google/login" name="platform/tools/studio/google/login"/>
+  <project path="tools/studio/google/play" name="platform/tools/studio/google/play"/>
+  <project path="tools/studio/google/samples" name="platform/tools/studio/google/samples"/>
+  <project path="tools/studio/google/services" name="platform/tools/studio/google/services"/>
+  <project path="tools/studio/google/appindexing" name="platform/tools/studio/google/appindexing"/>
 
 </manifest>