diff options
| author | Vince Harron <vharron@google.com> | 2014-09-03 14:41:10 -0700 |
|---|---|---|
| committer | Vince Harron <vharron@google.com> | 2014-09-03 15:51:54 -0700 |
| commit | 1806a21b0d64ca657cda80a7168d12129badc192 (patch) | |
| tree | e8421cd10cb5219535dae3b27c088bed02f01ac5 | |
| parent | bed0570fb58790126c22bb5e74908a6f420b131c (diff) | |
| download | manifest-1806a21b0d64ca657cda80a7168d12129badc192.tar.gz | |
added clang 3.5 prebuilts for emulator builds, refactoring
added clang 3.5 prebuilts for emulator builds
removed obsolete x86_64-linux-glibc2.11-4.6 rebuilts
moved master/release invariant projects to bottom of file to make
merging between branches easier
added revision=”master” even in master version of file to make
comparisons to other branches easier
| -rw-r--r-- | default.xml | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/default.xml b/default.xml index ac2a85cb3..96c6645b7 100644 --- a/default.xml +++ b/default.xml @@ -16,19 +16,8 @@ <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/gtest" name="platform/external/gtest" /> <project path="external/qemu" name="platform/external/qemu" /> <project path="prebuilts/android-emulator" name="platform/prebuilts/android-emulator" /> - <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/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-w64-mingw32-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" /> - <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" /> <project path="prebuilts/tools" name="platform/prebuilts/tools" /> <project path="sdk" name="platform/sdk" /> <project path="tools/adt/eclipse" name="platform/tools/adt/eclipse" /> @@ -36,10 +25,22 @@ <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" /> <project path="tools/gradle" name="platform/tools/gradle" /> <project path="tools/idea" name="platform/tools/idea" /> <project path="tools/studio/cloud" name="platform/tools/studio/cloud" /> <project path="tools/swt" name="platform/tools/swt" /> + <!-- these projects use the master branch --> + <project path="external/ant-glob" name="platform/external/ant-glob" revision="master" /> + <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" revision="master" /> + <project path="external/emma" name="platform/external/emma" revision="master"/> + <project path="external/gtest" name="platform/external/gtest" revision="master" /> + <project path="prebuilts/clang/darwin-x86/host/3.5" name="platform/prebuilts/clang/darwin-x86/host/3.5" revision="master" /> + <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.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/qemu-kernel" name="platform/prebuilts/qemu-kernel" revision="master" /> + <project path="tools/external/gradle" name="platform/tools/external/gradle" revision="master"/> </manifest> |