Snap for 9506033 from c79c3139ffdb97380c9d384edc8388cbca2cbf6b to studio-giraffe-release

Change-Id: Ia10f39b3d5b5dcbeb1047a002468d295429bf555

3 files changed, 16 insertions, 6 deletions

diff --git a/BUILD.bazel b/BUILD.bazel
index ff6dd8b9..ac71d8e2 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -4,7 +4,7 @@ load("//tools/base/bazel:utils.bzl", "fileset", "merged_properties")
 load("//tools/base/bazel:gradle.bzl", "gradle_build")
 load("//tools/base/bazel:maven.bzl", "maven_library", "maven_repository")
 load("//tools/base/bazel:utils.bzl", "java_jarjar", "merged_zip")
-load("//tools/base/common:version.bzl", "BUILD_VERSION")
+load("//tools/base/common:version.bzl", "BUILD_VERSION", "DEV_BUILD_VERSION", "RELEASE_BUILD_VERSION")
 
 exports_files(["databinding.properties"])
 
@@ -348,6 +348,15 @@ maven_repository(
     ],
 )
 
+GRADLE_PROPERTIES = select({
+    "//tools/base/bazel:release": {
+        "version": RELEASE_BUILD_VERSION,
+    },
+    "//conditions:default": {
+        "version": DEV_BUILD_VERSION,
+    },
+})
+
 gradle_build(
     name = "runtimeLibrariesAndroidX",
     build_file = "extensions/build.gradle",
@@ -371,6 +380,7 @@ gradle_build(
             "extensions/gradlew.bat",
         ],
     ),
+    gradle_properties = GRADLE_PROPERTIES,
     max_workers = 1,  # b/155772061
     output_file = "data_binding_runtime_androidx.zip",
     output_file_source = "local_repo_zip/dataBindingRuntimeRepo.zip",
@@ -407,6 +417,7 @@ gradle_build(
             "extensions-support/gradlew.bat",
         ],
     ),
+    gradle_properties = GRADLE_PROPERTIES,
     max_workers = 1,  # b/155772061
     output_file = "data_binding_runtime_support.zip",
     output_file_source = "local_repo_zip/dataBindingRuntimeRepo.zip",
diff --git a/extensions-support/build.gradle b/extensions-support/build.gradle
index 620920df..80e3a4dc 100644
--- a/extensions-support/build.gradle
+++ b/extensions-support/build.gradle
@@ -48,7 +48,7 @@ buildscript {
     Properties databindingProperties = new Properties()
     databindingProperties.load(new FileInputStream("$projectDir/../databinding.properties"))
     Properties buildToolsProperties = new Properties()
-    buildToolsProperties.load(new FileInputStream("$projectDir/../../base/common/version.bzl"))
+    buildToolsProperties.load(new FileInputStream("$projectDir/../../base/common/release_version.bzl"))
 
     def runningInIde = project.hasProperty('android.injected.invoked.from.ide')
     // this is done by bazel but if we are in IDE it also configures so we need to distinguish
@@ -56,7 +56,7 @@ buildscript {
     ext.autoConfigured = autoConfigured
 
 
-    def TOOLS_VERSION = project.providers.environmentVariable("VERSION").orElse(buildToolsProperties.get("BUILD_VERSION").toString()).get() - '"' - '"'
+    def TOOLS_VERSION = project.providers.gradleProperty("version").orElse(project.providers.environmentVariable("VERSION")).orElse(buildToolsProperties.get("BUILD_VERSION").toString()).get() - '"' - '"'
     def OUT_REPO = project.providers.environmentVariable("OUT_REPO")
             .orElse(project.providers.environmentVariable("BUILD_DIR"))
             .orNull
diff --git a/extensions/build.gradle b/extensions/build.gradle
index 96a9f335..0ee7a946 100644
--- a/extensions/build.gradle
+++ b/extensions/build.gradle
@@ -50,7 +50,7 @@ buildscript {
     Properties databindingProperties = new Properties()
     databindingProperties.load(new FileInputStream("$projectDir/../databinding.properties"))
     Properties buildToolsProperties = new Properties()
-    buildToolsProperties.load(new FileInputStream("$projectDir/../../base/common/version.bzl"))
+    buildToolsProperties.load(new FileInputStream("$projectDir/../../base/common/release_version.bzl"))
     Properties dependencyProperties = new Properties()
     dependencyProperties.load(new FileInputStream("$projectDir/../../buildSrc/base/dependencies.properties"))
 
@@ -59,8 +59,7 @@ buildscript {
     def autoConfigured = !gradle.startParameter.getInitScripts().isEmpty() && !runningInIde
     ext.autoConfigured = autoConfigured
 
-    def TOOLS_VERSION =
-            System.getenv("VERSION") ?: buildToolsProperties.get("BUILD_VERSION").toString() - '"' - '"'
+    def TOOLS_VERSION = project.providers.gradleProperty("version").orElse(project.providers.environmentVariable("VERSION")).orElse(buildToolsProperties.get("BUILD_VERSION").toString()).get() - '"' - '"'
     def OUT_REPO = System.getenv("OUT_REPO") ?: System.getenv("BUILD_DIR")
     def MAVEN_REPO = System.getenv("MAVEN_REPO")
     def PREBUILTS_REPO = System.getenv("PREBUILTS_REPO")