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/test/java/com | |
| 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/test/java/com')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java index 82c6aa515f..e4275c9a85 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java @@ -21,7 +21,6 @@ import com.google.devtools.build.lib.events.Reporter; import com.google.devtools.build.lib.events.util.EventCollectionApparatus; import com.google.devtools.build.lib.packages.CachingPackageLocator; import com.google.devtools.build.lib.packages.ConstantRuleVisibility; -import com.google.devtools.build.lib.packages.ExternalPackage; import com.google.devtools.build.lib.packages.GlobCache; import com.google.devtools.build.lib.packages.MakeEnvironment; import com.google.devtools.build.lib.packages.Package; @@ -128,8 +127,10 @@ public class PackageFactoryApparatus { GlobCache globCache = new GlobCache( buildFile.getParentDirectory(), packageId, locator, null, TestUtils.getPool()); LegacyGlobber globber = new LegacyGlobber(globCache); - ExternalPackage externalPkg = new ExternalPackage.Builder( - buildFile.getParentDirectory().getRelative("WORKSPACE"), "TESTING").build(); + Package externalPkg = + Package.newExternalPackageBuilder( + buildFile.getParentDirectory().getRelative("WORKSPACE"), "TESTING") + .build(); LegacyBuilder resultBuilder = factory.evaluateBuildFile( externalPkg, |