diff options
| author |  Nathan Harmata <nharmata@google.com> | 2017-03-01 02:55:48 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2017-03-01 12:35:42 +0000 |
| commit | b869e584641521dc063f0589d7ce6a850ffc0b61 (patch) | |
| tree | 2694c728b3955154587e1425642e77023c88fd30 /src/main/java/com/google/devtools/build/lib/rules/genquery | |
| parent | 81aca8a39dc8b44bba8637998627201240a9c48c (diff) | |
Rollback of commit 822c37816ac669e51bec3853b41849a19ec5e230.
--
PiperOrigin-RevId: 148844518
MOS_MIGRATED_REVID=148844518
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/genquery')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java b/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java index e01aa4fcbd..589822b805 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java +++ b/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java @@ -55,6 +55,7 @@ import com.google.devtools.build.lib.query2.engine.DigraphQueryEvalResult; import com.google.devtools.build.lib.query2.engine.QueryEnvironment.QueryFunction; import com.google.devtools.build.lib.query2.engine.QueryEnvironment.Setting; import com.google.devtools.build.lib.query2.engine.QueryException; +import com.google.devtools.build.lib.query2.engine.QueryExpressionEvalListener; import com.google.devtools.build.lib.query2.engine.QueryUtil; import com.google.devtools.build.lib.query2.engine.QueryUtil.AggregateAllOutputFormatterCallback; import com.google.devtools.build.lib.query2.engine.SkyframeRestartQueryException; @@ -283,7 +284,7 @@ public class GenQuery implements RuleConfiguredTargetFactory { DigraphQueryEvalResult<Target> queryResult; OutputFormatter formatter; AggregateAllOutputFormatterCallback<Target> targets = - QueryUtil.newOrderedAggregateAllOutputFormatterCallback(); + QueryUtil.newAggregateAllOutputFormatterCallback(); try { Set<Setting> settings = queryOptions.toSettings(); @@ -317,6 +318,7 @@ public class GenQuery implements RuleConfiguredTargetFactory { getEventHandler(ruleContext), settings, ImmutableList.<QueryFunction>of(), + QueryExpressionEvalListener.NullListener.<Target>instance(), /*packagePath=*/null); queryResult = (DigraphQueryEvalResult<Target>) queryEnvironment.evaluateQuery(query, targets); } catch (SkyframeRestartQueryException e) { |