diff options
| author |  janakr <janakr@google.com> | 2018-03-28 09:58:15 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-03-28 09:59:32 -0700 |
| commit | 56d785217deabcae751a2c9143cb85bec4568e3e (patch) | |
| tree | d4abaabf2b7eb30c135a90db5fb3f02dde9d150a /src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java | |
| parent | 235f301f365b2d4502702df9604609252c57d662 (diff) | |
Put configuration checksum into BuildOptions$OptionsDiffForReconstruction and make it available to ConfiguredTarget. Also give BuildConfigurationValue.Key the same toString() that BuildConfiguration had, so we recover how we used to print out ConfiguredTarget labels in debugging.
This may have a tiny bit of overhead in serialization, but we'll cross that bridge when we come to it. Could just make the string a constant.
PiperOrigin-RevId: 190787145
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java index 26d6132b4f..51cbfbc261 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java @@ -55,7 +55,6 @@ import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory; -import com.google.devtools.build.lib.util.Fingerprint; import com.google.devtools.build.lib.util.OS; import com.google.devtools.build.lib.util.RegexFilter; import com.google.devtools.build.lib.vfs.Path; @@ -1360,7 +1359,7 @@ public class BuildConfiguration { globalMakeEnvBuilder.put("GENDIR", getGenfilesDirectory().getExecPath().getPathString()); globalMakeEnv = globalMakeEnvBuilder.build(); - checksum = computeChecksum(buildOptions); + checksum = buildOptions.computeChecksum(); hashCode = computeHashCode(); ImmutableSet.Builder<String> reservedActionMnemonics = ImmutableSet.builder(); @@ -1371,10 +1370,6 @@ public class BuildConfiguration { this.buildEventSupplier = Suppliers.memoize(this::createBuildEvent); } - public static String computeChecksum(BuildOptions buildOptions) { - return Fingerprint.md5Digest(buildOptions.computeCacheKey()); - } - /** * Returns a copy of this configuration only including the given fragments (which the current * configuration is assumed to have). |