diff options
| -rw-r--r-- | default.xml | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/default.xml b/default.xml index 32867e3b0..fda9643f8 100644 --- a/default.xml +++ b/default.xml @@ -19,27 +19,24 @@ <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" /> - <linkfile src="base/.editorconfig" dest="tools/base/.editorconfig" /> - <linkfile src="base/.editorconfig" dest="tools/analytics-library/.editorconfig" /> - <linkfile src="base/.editorconfig" dest="tools/data-binding/.editorconfig" /> <linkfile src="base/gradle.properties" dest="tools/gradle.properties" /> </project> <project path="external/dexter" name="platform/tools/dexter" revision="c7647ba8018b84c399ce5d282d1ac1b9a44b5cd2" /> - <project path="external/doclava" name="platform/external/doclava" revision="master" /> - <project path="external/dokka" name="platform/external/dokka" groups="pdk" clone-depth="1" revision="master" /> + <project path="external/doclava" name="platform/external/doclava" revision="main" /> + <project path="external/dokka" name="platform/external/dokka" groups="pdk" clone-depth="1" revision="main" /> <project path="external/freetype" name="platform/external/freetype" revision="93615c094b6b7a87b751916f79fe8849477d7ca8" upstream="qt-release" /> <project path="external/gflags" name="platform/external/gflags" /> - <project path="external/googletest" name="platform/external/googletest" revision="master" /> + <project path="external/googletest" name="platform/external/googletest" revision="e87584ebb141cd532f4688556835903c44563292" /> <project path="external/grpc-grpc" name="platform/external/grpc-grpc" /> <project path="external/jetbrains/kotlin" name="platform/external/jetbrains/kotlin" remote="goog-and-upload-aosp" revision="mirror-aosp-studio-master-dev" dest-branch="studio-master-dev" /> <project path="external/libpng" name="platform/external/libpng" revision="80c03e1c7bd6d3edebe795375103927bef2b67f3" upstream="qt-release" /> <project path="external/nanopb-c" name="platform/external/nanopb-c" /> <project path="external/perfetto" name="platform/external/perfetto" revision="c56efe5e96190e5d990001053377b203d51f4de5" /> <project path="external/protobuf" name="platform/external/protobuf" /> - <project path="external/skia" name="platform/external/skia" revision="rvc-release" /> + <project path="external/skia" name="platform/external/skia" revision="sc-release" clone-depth="1"/> <project path="external/zlib" name="platform/external/zlib" /> - <project path="frameworks/layoutlib" name="platform/frameworks/layoutlib" clone-depth="1" revision="7231d66ec2c8227b08d1e65c3e084f1bdabd1933" upstream="rvc-layoutlib-native" groups="notdefault,layoutlib" /> + <project path="frameworks/layoutlib" name="platform/frameworks/layoutlib" clone-depth="1" revision="d02422d21d0401fa1181ea72a01a8254dafbc051" upstream="rvc-layoutlib-native" groups="notdefault,layoutlib" /> <project path="prebuilts/clang/host/darwin-x86" name="platform/prebuilts/clang/host/darwin-x86" clone-depth="1" groups="notdefault,platform-darwin" /> <project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" clone-depth="1" groups="notdefault,platform-linux" /> <project path="prebuilts/clang/host/windows-x86" name="platform/prebuilts/clang/host/windows-x86" clone-depth="1" groups="notdefault,platform-windows" /> @@ -54,7 +51,7 @@ <project path="tools/analytics-library" name="platform/tools/analytics-library" /> <project path="tools/apksig" name="platform/tools/apksig" /> <project path="tools/apkzlib" name="platform/tools/apkzlib" /> - <project path="tools/assets" name="assets/android-studio-ux-assets" clone-depth="1" revision="master" /> + <project path="tools/assets" name="assets/android-studio-ux-assets" clone-depth="1" revision="main" /> <project path="tools/base" name="platform/tools/base"> <linkfile src="bazel/toplevel.WORKSPACE" dest="WORKSPACE" /> <linkfile src="bazel/toplevel.bazelignore" dest=".bazelignore" /> @@ -63,9 +60,7 @@ <linkfile src="bazel/toolchains/darwin/wrapped_ar" dest="prebuilts/clang/studio-extra/wrapped_ar.darwin" /> </project> <project path="tools/data-binding" name="platform/frameworks/data-binding"/> - <project path="tools/dx/dalvik" name="platform/dalvik" /> <project path="tools/external/bazelbuild-rules-kotlin" name="platform/tools/external/bazelbuild-rules-kotlin" /> - <project path="tools/external/desugar" name="platform/external/desugar" /> <project path="tools/external/fat32lib" name="platform/tools/external/fat32lib" /> <project path="tools/external/gradle" name="platform/tools/external/gradle" clone-depth="1" /> <project path="tools/gradle" name="platform/tools/gradle" /> @@ -84,7 +79,7 @@ <project path="tools/vendor/galvsoft" name="platform/tools/vendor/galvsoft" /> <project path="tools/vendor/google" name="platform/tools/vendor/google" /> <project path="tools/vendor/google3/blaze" name="platform/tools/vendor/google3/blaze" /> - <project path="tools/vendor/intel" name="platform/tools/vendor/intel" revision="master" /> + <project path="tools/vendor/intel" name="platform/tools/vendor/intel" revision="main" /> <project path="tools/vendor/intellij/cidr" name="platform/tools/vendor/intellij/cidr" /> <project path="tools/vendor/adt_infra_internal" name="platform/tools/adt_infra_internal" groups="adt-infra" /> <project path="prebuilts/studio/buildbenchmarks" name="platform/tools/vendor/google_prebuilt/buildbenchmarks" clone-depth="1" /> |