summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-04-17 16:34:54 -0700
committerXin Li <delphij@google.com>2019-04-17 16:34:54 -0700
commitc1245cf7d8eb63cf4fc6289b04016647d4f08782 (patch)
tree25b64d7c552b69aa0244e7ecf0a3e21abf75f273
parentd9ce56ec3c856becd9974ac898eb37abd7e20f35 (diff)
downloadmanifest-c1245cf7d8eb63cf4fc6289b04016647d4f08782.tar.gz
Manifest for Android Studio 3.4 push.
Bug: 126427048 Change-Id: I3e1286a2268ab115d4959d1fe8d9a3946f1112bc
-rw-r--r--default.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/default.xml b/default.xml
index 94493131c..f5b8c1809 100644
--- a/default.xml
+++ b/default.xml
@@ -28,7 +28,7 @@
<project path="external/AntennaPod/afollestad" name="platform/external/AntennaPod/afollestad" />
<project path="external/gradle-perf-android-medium" name="platform/external/gradle-perf-android-medium" />
<project path="external/android-studio-gradle-test" name="platform/external/android-studio-gradle-test" />
- <project path="external/jetbrains/kotlin" name="platform/external/jetbrains/kotlin" dest-branch="studio-3.2-dev" />
+ <project path="external/jetbrains/kotlin" name="platform/external/jetbrains/kotlin" />
<project path="external/protobuf" name="platform/external/protobuf" />
<project path="external/nanopb-c" name="platform/external/nanopb-c" />
<project path="external/grpc-grpc" name="platform/external/grpc-grpc" />
@@ -61,12 +61,12 @@
<project path="tools/dx/dalvik" name="platform/dalvik" />
<project path="tools/base" name="platform/tools/base">
<linkfile src="bazel/toplevel.WORKSPACE" dest="WORKSPACE" />
- <linkfile src="bazel/toplevel.bazel.rc" dest="tools/bazel.rc" />
<linkfile src="bazel/sdk/prebuilts.studio.sdk.BUILD" dest="prebuilts/studio/sdk/BUILD" />
<linkfile src="bazel/sdk/prebuilts.studio.sdk.README.md" dest="prebuilts/studio/sdk/README.md" />
</project>
<project path="tools/apkzlib" name="platform/tools/apkzlib" />
<project path="tools/data-binding" name="platform/frameworks/data-binding"/>
+ <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" />