summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json7
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.json b/configure.json
index 59358180d0..77f956ed1a 100644
--- a/configure.json
+++ b/configure.json
@@ -423,7 +423,7 @@
"features": {
"prepare": {
- "output": [ "prepareOptions", "preparePaths" ]
+ "output": [ "prepareSpec", "prepareOptions", "preparePaths" ]
},
"machineTuple": {
"condition": "!config.linux || config.android || tests.machineTuple",
@@ -984,6 +984,11 @@
"earlyReport": [
{
+ "type": "fatal",
+ "condition": "input.xplatform != '' && input.device != ''",
+ "message": "Cannot specify both -xplatform and -device."
+ },
+ {
"condition": "!features.prepare",
"comment": "This is not an actual report - instead, it activates the early setup."
},