| commit | 0834cd0a064c845b48fce99c2154d55615e7c368 | [log] [tgz] |
|---|---|---|
| author | Julien Desprez <jdesprez@google.com> | Tue May 14 16:59:08 2019 -0700 |
| committer | Julien Desprez <jdesprez@google.com> | Tue Aug 20 00:09:49 2019 +0000 |
| tree | fee925ee42cffb5e651094e5e1757e007aa16fa0 | |
| parent | f3f394200f30e72aee28895fcc46ecf1c1adc784 [diff] |
Ensure we use the version.txt when available am: 77846085c0 am: 103f1ea4e9 am: 043b8850e8 Bug: 139705406 Change-Id: Ibd50db8927383679a0517eb190a0f5f722cc73e4 (cherry picked from commit d62ff5998f62da2541f7fdd5a9c3cffe0477be97) Merged-In: I50ee5a5f47131ec970b9116996b36971cd59bc40
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildProvider.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildProvider.java index d84483e..cfbfa1c 100644 --- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildProvider.java +++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildProvider.java
@@ -32,6 +32,7 @@ import com.android.tradefed.testtype.IInvocationContextReceiver; import com.android.tradefed.testtype.suite.TestSuiteInfo; import com.android.tradefed.util.FileUtil; +import com.android.tradefed.util.VersionParser; import java.io.File; import java.io.IOException; @@ -310,7 +311,12 @@ * Return the SuiteInfo build number generated at build time. Exposed for testing. */ protected String getSuiteInfoBuildNumber() { - return TestSuiteInfo.getInstance().getBuildNumber(); + String buildNumber = TestSuiteInfo.getInstance().getBuildNumber(); + String versionFile = VersionParser.fetchVersion(); + if (versionFile != null) { + buildNumber = versionFile; + } + return buildNumber; } /**