diff options
-rw-r--r-- | default.xml | 57 |
1 files changed, 19 insertions, 38 deletions
diff --git a/default.xml b/default.xml index 28063fe89..bb76b79e8 100644 --- a/default.xml +++ b/default.xml @@ -4,7 +4,7 @@ <remote name="aosp" fetch=".." review="https://android-review.googlesource.com/" /> - <default revision="studio-1.4-dev" + <default revision="studio-master-dev" remote="aosp" sync-j="4" /> @@ -17,48 +17,29 @@ </project> <project path="external/ant-glob" name="platform/external/ant-glob" revision="master" /> - <project path="external/clang" name="platform/external/clang" groups="lldb,notdefault" /> <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" revision="master" /> - <project path="external/gtest" name="platform/external/gtest" revision="master" groups="gpu" /> - <project path="external/emma" name="platform/external/emma" revision="master"/> - <project path="external/gmock" name="platform/external/gmock" revision="master" groups="gpu" /> - <project path="external/iosched" name="platform/external/iosched" revision="master" /> - <project path="external/lldb" name="platform/external/lldb" groups="lldb,notdefault" /> - <project path="external/lldb-utils" name="platform/external/lldb-utils" groups="lldb,notdefault" /> - <project path="external/llvm" name="platform/external/llvm" groups="lldb,notdefault"/> + <project path="external/gtest" name="platform/external/gtest" revision="master" /> + <project path="external/emma" name="platform/external/emma" revision="master" /> + <project path="external/gmock" name="platform/external/gmock" revision="master" /> <project path="external/protobuf" name="platform/external/protobuf" /> <project path="external/qemu" name="platform/external/qemu" /> <project path="external/qemu-android" name="platform/external/qemu-android" /> - <project path="frameworks/native" name="platform/frameworks/native" revision="lollipop-release" /> <project path="prebuilts/android-emulator" name="platform/prebuilts/android-emulator" /> <project path="prebuilts/android-emulator-build/archive" name="platform/prebuilts/android-emulator-build/archive" clone-depth="1" /> <project path="prebuilts/android-emulator-build/mesa" name="platform/prebuilts/android-emulator-build/mesa" clone-depth="1" /> <project path="prebuilts/android-emulator-build/mesa-deps" name="platform/prebuilts/android-emulator-build/mesa-deps" clone-depth="1" /> <project path="prebuilts/android-emulator-build/qemu-android-deps" name="platform/prebuilts/android-emulator-build/qemu-android-deps" clone-depth="1" /> - <project path="prebuilts/clang/darwin-x86/host/3.5" name="platform/prebuilts/clang/darwin-x86/host/3.5" revision="master" groups="gpu" /> - <project path="prebuilts/clang/darwin-x86/host/3.6" name="platform/prebuilts/clang/darwin-x86/host/3.6" clone-depth="1" groups="lldb,notdefault,darwin" /> + <project path="prebuilts/clang/darwin-x86/host/3.5" name="platform/prebuilts/clang/darwin-x86/host/3.5" revision="master" /> <project path="prebuilts/clang/darwin-x86/sdk/3.5" name="platform/prebuilts/clang/darwin-x86/sdk/3.5" revision="master" /> - <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" revision="master" /> <project path="prebuilts/eclipse-build-deps-sources" name="platform/prebuilts/eclipse-build-deps-sources" revision="master" /> - <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" revision="master"/> - <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" revision="master" /> - <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" revision="master" groups="gpu" /> - <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" revision="master" groups="gpu" /> - <project path="prebuilts/go/linux-x86" name="platform/prebuilts/go/linux-x86" groups="gpu" /> - <project path="prebuilts/go/darwin-x86" name="platform/prebuilts/go/darwin-x86" groups="gpu" /> - <project path="prebuilts/go/windows-x86" name="platform/prebuilts/go/windows-x86" 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/windows-x86" name="platform/prebuilts/python/windows-x86" clone-depth="1" groups="lldb,notdefault,windows" /> + <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" revision="master" /> + <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" revision="master" /> + <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" revision="master" /> + <project path="prebuilts/go/linux-x86" name="platform/prebuilts/go/linux-x86" /> + <project path="prebuilts/go/darwin-x86" name="platform/prebuilts/go/darwin-x86" /> + <project path="prebuilts/go/windows-x86" name="platform/prebuilts/go/windows-x86" /> <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" revision="master" /> - <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" revision="master" /> <project path="sdk" name="platform/sdk" /> <project path="tools/adt/eclipse" name="platform/tools/adt/eclipse" /> @@ -66,15 +47,15 @@ <project path="tools/base" name="platform/tools/base" /> <project path="tools/emulator" name="platform/tools/emulator" /> <project path="tools/external/fat32lib" name="platform/tools/external/fat32lib" /> - <project path="tools/external/gradle" name="platform/tools/external/gradle" revision="master"/> - <project path="tools/gpu/src/android.googlesource.com/platform/tools/gpu" name="platform/tools/gpu" groups="gpu" /> - <project path="tools/gpu/src/github.com/go-gl-legacy/gl" name="platform/tools/external/go/src/github.com/go-gl-legacy/gl" revision="master" groups="gpu" /> - <project path="tools/gpu/src/github.com/go-gl/glfw" name="platform/tools/external/go/src/github.com/go-gl/glfw" revision="master" groups="gpu" /> - <project path="tools/gpu/src/github.com/golang/protobuf" name="platform/tools/external/go/src/github.com/golang/protobuf" revision="master" groups="gpu" /> - <project path="tools/gpu/src/golang.org/x/net" name="platform/tools/external/go/src/golang.org/x/net" revision="master" groups="gpu" /> - <project path="tools/gpu/src/golang.org/x/tools" name="platform/tools/external/go/src/golang.org/x/tools" revision="master" groups="gpu" /> + <project path="tools/external/go/src/github.com/go-gl-legacy/gl" name="platform/tools/external/go/src/github.com/go-gl-legacy/gl" revision="master" /> + <project path="tools/external/go/src/github.com/go-gl/glfw" name="platform/tools/external/go/src/github.com/go-gl/glfw" revision="master" /> + <project path="tools/external/go/src/github.com/golang/protobuf" name="platform/tools/external/go/src/github.com/golang/protobuf" revision="master" /> + <project path="tools/external/go/src/golang.org/x/net" name="platform/tools/external/go/src/golang.org/x/net" revision="master" /> + <project path="tools/external/go/src/golang.org/x/tools" name="platform/tools/external/go/src/golang.org/x/tools" revision="master" /> + <project path="tools/external/gradle" name="platform/tools/external/gradle" revision="master" /> <project path="tools/gradle" name="platform/tools/gradle" /> - <project path="tools/idea" name="platform/tools/idea" revision="idea14-1.4-dev" /> + <project path="tools/gpu" name="platform/tools/gpu" /> + <project path="tools/idea" name="platform/tools/idea" revision="idea14-dev" /> <project path="tools/studio/google/cloud/testing" name="platform/tools/studio/google/cloud/testing" /> <project path="tools/studio/google/cloud/tools" name="platform/tools/studio/google/cloud/tools" /> <project path="tools/studio/google/login" name="platform/tools/studio/google/login" /> |