aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
diff options
context:
space:
mode:
authorGravatar laurentlb <laurentlb@google.com>2017-06-30 20:27:59 +0200
committerGravatar Marcel Hlopko <hlopko@google.com>2017-07-03 09:06:28 +0200
commit8112a5604d6c4d6a182fee78bdb9755659f02024 (patch)
treee51c67a6df0a8aaf8686ba5c5fdc0efc45577aef /src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
parent24d8cc8efa1b86fa5dcffcc3b223759eb7b2817f (diff)
Inline AttributeContainer.ATTRIBUTE_CONTAINER_FACTORY and PathFragment.TO_PATH_FRAGMENT
RELNOTES: None. PiperOrigin-RevId: 160668541
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
index 5d8e160b0a..493130641f 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
@@ -321,13 +321,14 @@ public abstract class AbstractPackageLoader implements PackageLoader {
CacheBuilder.newBuilder().build();
Cache<PackageIdentifier, CacheEntryWithGlobDeps<AstAfterPreprocessing>> astCache =
CacheBuilder.newBuilder().build();
- PackageFactory pkgFactory = new PackageFactory(
- ruleClassProvider,
- null,
- AttributeContainer.ATTRIBUTE_CONTAINER_FACTORY,
- getEnvironmentExtensions(),
- getName(),
- Package.Builder.DefaultHelper.INSTANCE);
+ PackageFactory pkgFactory =
+ new PackageFactory(
+ ruleClassProvider,
+ null,
+ AttributeContainer::new,
+ getEnvironmentExtensions(),
+ getName(),
+ Package.Builder.DefaultHelper.INSTANCE);
pkgFactory.setGlobbingThreads(legacyGlobbingThreads);
ImmutableMap.Builder<SkyFunctionName, SkyFunction> builder = ImmutableMap.builder();
builder