From cf932594dcc9fa3e701e6cd8f564aa9fc3277563 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Thu, 23 Jan 2020 07:56:09 +0100
Subject: cmake: add Android build

Task-number: QTBUG-78945
Change-Id: I5a5f24f3c073f39f06f0ac1242c8a61a9fe64204
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 coin/module_config.yaml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 9f29e11..7f31a55 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -1,13 +1,12 @@
-version: 1
+version: 2
 accept_configuration:
   condition: property
-  property: host.os
-  equals_property: target.os
+  property: features
+  not_contains_value: Disable
 
-build_instructions:
-  - !include "{{qt/qtbase}}/prepare_building_env.yaml"
-  - !include "{{qt/qtbase}}/cmake_module_build_instructions.yaml"
-  - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml"
+instructions:
+  Build:
+    - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml"
 
-test_instructions:
-  - !include "{{qt/qtbase}}/cmake_regular_test_instructions.yaml"
+  Test:
+    - !include "{{qt/qtbase}}/coin_module_test_template_v2.yaml"
-- 
cgit v1.2.1