Revert "Use new bucket temporarily"
This reverts commit 0a03bff62e1aeb83b002067c54af203345604a97.
Reason for revert:back to r8-deps
Change-Id: I658f887ae47ff98436c0ff727a3e3a50092cabc2
diff --git a/d8_r8/commonBuildSrc/src/main/kotlin/DownloadAllDependenciesTask.kt b/d8_r8/commonBuildSrc/src/main/kotlin/DownloadAllDependenciesTask.kt
index c0b0f69..f05116d 100644
--- a/d8_r8/commonBuildSrc/src/main/kotlin/DownloadAllDependenciesTask.kt
+++ b/d8_r8/commonBuildSrc/src/main/kotlin/DownloadAllDependenciesTask.kt
@@ -107,7 +107,7 @@
@Throws(IOException::class, InterruptedException::class)
private fun downloadFromGoogleStorage(parameters: RunDownloadParameters, sha1File: File) {
- val args = Arrays.asList("-n", "-b", "r8-deps-new-backup", "-s", "-u", sha1File.toString())
+ val args = Arrays.asList("-n", "-b", "r8-deps", "-s", "-u", sha1File.toString())
if (OperatingSystem.current().isWindows) {
val command: MutableList<String> = ArrayList()
command.add("download_from_google_storage.bat")
@@ -163,4 +163,4 @@
return true
}
}
-}
+}
\ No newline at end of file
diff --git a/d8_r8/settings.gradle.kts b/d8_r8/settings.gradle.kts
index 1b861f6..03039c0 100644
--- a/d8_r8/settings.gradle.kts
+++ b/d8_r8/settings.gradle.kts
@@ -11,7 +11,7 @@
rootProject.name = "d8-r8"
// Bootstrap building by downloading dependencies.
-val dependencies_bucket = "r8-deps-new-backup"
+val dependencies_bucket = "r8-deps"
val root = rootProject.projectDir
fun getRepoRoot() : File {
diff --git a/tools/utils.py b/tools/utils.py
index de924e4..2b77ed5 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -334,7 +334,7 @@
def DownloadFromGoogleCloudStorage(sha1_file,
- bucket='r8-deps-new-backup',
+ bucket='r8-deps',
auth=False,
quiet=False):
suffix = '.bat' if IsWindows() else ''
