diff options
| author |  Han-Wen Nienhuys <hanwen@google.com> | 2015-09-18 17:37:51 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2015-09-21 08:59:16 +0000 |
| commit | f172d396bbab9dec8f6beda0b0969f33a25709cd (patch) | |
| tree | 76da22fa1681be1bda2de36812aeec76876c6ea6 /src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java | |
| parent | f081184097239243b436f96774b63b010d5e021f (diff) | |
Do not store a separate map for external package data. This ensures that serialization works correctly.
Removes ExternalPackage as Package specialization.
--
MOS_MIGRATED_REVID=103395682
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java b/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java index 6dd38da11d..e2fccb0353 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java @@ -16,7 +16,7 @@ package com.google.devtools.build.lib.skyframe; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; -import com.google.devtools.build.lib.packages.ExternalPackage; +import com.google.devtools.build.lib.packages.Package; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.RootedPath; @@ -134,7 +134,7 @@ public class ExternalFilesHelper { PackageValue pkgValue = (PackageValue) Preconditions.checkNotNull( - env.getValue(PackageValue.key(ExternalPackage.PACKAGE_IDENTIFIER))); + env.getValue(PackageValue.key(Package.EXTERNAL_PACKAGE_IDENTIFIER))); Preconditions.checkState(!pkgValue.getPackage().containsErrors()); } } |