summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--default.xml8
-rw-r--r--studio-sdk.xml19
2 files changed, 24 insertions, 3 deletions
diff --git a/default.xml b/default.xml
index 43573708f..ce0b8e51f 100644
--- a/default.xml
+++ b/default.xml
@@ -22,7 +22,7 @@
<linkfile src="base/gradle.properties" dest="tools/gradle.properties" />
</project>
- <project path="external/dexter" name="platform/tools/dexter" revision="c402d95f395716ada9f4c8941901fc8a47c7f447" />
+ <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/freetype" name="platform/external/freetype" revision="93615c094b6b7a87b751916f79fe8849477d7ca8" upstream="qt-release" />
@@ -32,11 +32,11 @@
<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="71986159344891247bd93ea350416f82b4ffaeee" />
+ <project path="external/perfetto" name="platform/external/perfetto" revision="7fc367463824cc8f98d5e50fa07460d5f251097e" />
<project path="external/protobuf" name="platform/external/protobuf" />
<project path="external/skia" name="platform/external/skia" revision="rvc-release" />
<project path="external/zlib" name="platform/external/zlib" />
- <project path="frameworks/layoutlib" name="platform/frameworks/layoutlib" clone-depth="1" revision="e0cc6d3735d66d99298af31a705b10b0cf42c16f" upstream="qt-layoutlib-dev" groups="notdefault,layoutlib" />
+ <project path="frameworks/layoutlib" name="platform/frameworks/layoutlib" clone-depth="1" revision="a70908fb1e4ed30c075ed5cb1facc3710d67216d" upstream="qt-layoutlib-native" groups="notdefault,layoutlib" />
<project path="prebuilts/google-breakpad/darwin-x86" name="platform/prebuilts/google-breakpad/darwin-x86" clone-depth="1" revision="lldb-master-dev" groups="lldb,notdefault,darwin" />
<project path="prebuilts/google-breakpad/linux-x86" name="platform/prebuilts/google-breakpad/linux-x86" clone-depth="1" revision="lldb-master-dev" groups="lldb,notdefault,linux" />
<project path="prebuilts/google-breakpad/windows-x86" name="platform/prebuilts/google-breakpad/windows-x86" clone-depth="1" revision="lldb-master-dev" groups="lldb,notdefault,windows" />
@@ -79,6 +79,7 @@
<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" />
+ <project path="tools/gradle-recipes" name="platform/tools/gradle-recipes" />
<project path="tools/idea" name="platform/tools/idea" />
<project path="tools/repohooks" name="platform/tools/repohooks" />
<project path="tools/sherpa" name="platform/frameworks/opt/sherpa" />
@@ -99,6 +100,7 @@
<project path="prebuilts/studio/buildbenchmarks" name="platform/tools/vendor/google_prebuilt/buildbenchmarks" clone-depth="1" />
<project path="prebuilts/android-emulator" name="platform/prebuilts/android-emulator" clone-depth="1" />
<project path="prebuilts/studio/sdk/remote" name="platform/tools/google_prebuilts/studio/sdk/remote" clone-depth="1" />
+ <project path="prebuilts/studio/intellij-sdk" name="platform/tools/vendor/google_prebuilts/studio/intellij-sdk" clone-depth="1" />
<project path="prebuilts/studio/sdk/darwin" name="platform/tools/vendor/google_prebuilts/studio/sdk/darwin" clone-depth="1" groups="notdefault,platform-darwin" />
<project path="prebuilts/studio/sdk/linux" name="platform/tools/vendor/google_prebuilts/studio/sdk/linux" clone-depth="1" groups="notdefault,platform-linux" />
<project path="prebuilts/studio/sdk/windows" name="platform/tools/vendor/google_prebuilts/studio/sdk/windows" clone-depth="1" groups="notdefault,platform-windows" />
diff --git a/studio-sdk.xml b/studio-sdk.xml
new file mode 100644
index 000000000..69da2789b
--- /dev/null
+++ b/studio-sdk.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+
+ <remote name="goog"
+ fetch=".."
+ review="sso://googleplex-android/" />
+ <default revision="studio-master-dev"
+ remote="goog"
+ sync-c="true" />
+ <manifest-server url="http://android-test:8787" />
+ <project path="tools/idea" name="platform/tools/idea" />
+ <project path="prebuilts/studio/jdk" name="platform/prebuilts/studio/jdk" clone-depth="1" />
+ <project path="prebuilts/tools" name="platform/prebuilts/tools" clone-depth="1" />
+ <!-- BEGIN closed-source projects -->
+ <project path="tools/vendor/intellij/cidr" name="platform/tools/vendor/intellij/cidr" />
+ <project path="prebuilts/studio/intellij-sdk" name="platform/tools/vendor/google_prebuilts/studio/intellij-sdk" clone-depth="1" />
+ <!-- END closed-source projects -->
+
+</manifest>