summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsooyeon.kim <sooyeon.kim@samsung.com>2018-10-01 11:05:11 +0900
committerSooyeon Kim <sooyeon.kim@samsung.com>2018-10-02 06:20:21 +0000
commit4ded00dc7c39ff7c02825868351e20b81639d441 (patch)
tree33e48615e073e0350d2792ece46ca814c76fc921
parent26d2286d60dd4f61efc9524f59f370db5b5aade3 (diff)
downloadbuilding-blocks-4ded00dc7c39ff7c02825868351e20b81639d441.tar.gz
building-blocks-4ded00dc7c39ff7c02825868351e20b81639d441.tar.bz2
building-blocks-4ded00dc7c39ff7c02825868351e20b81639d441.zip
[ACR-1294] Add multi-assistant building blocksubmit/tizen/20181002.062152accepted/tizen/unified/20181002.093411
Change-Id: Ie497ec663724f2e6cd3a6610d5ed22e00bd188c5 Signed-off-by: sooyeon.kim <sooyeon.kim@samsung.com>
-rw-r--r--build_test_img/test_set/TC0048_artik530_bb_list.txt12
-rw-r--r--mapping-bb-rs.xml3
-rw-r--r--mapping-bb-tct.xml5
-rw-r--r--packaging/domain-apis-uix.inc14
-rw-r--r--packaging/platform-preset-iot.inc1
5 files changed, 35 insertions, 0 deletions
diff --git a/build_test_img/test_set/TC0048_artik530_bb_list.txt b/build_test_img/test_set/TC0048_artik530_bb_list.txt
new file mode 100644
index 0000000..a95afb0
--- /dev/null
+++ b/build_test_img/test_set/TC0048_artik530_bb_list.txt
@@ -0,0 +1,12 @@
+# TC0048 multi assistant for ARTIK530
+# iot core for ARTIK530
+building-blocks-root-Preset_iot_core
+building-blocks-sub1-Preset_boards-ARTIK530
+building-blocks-sub2-Preset_boards-ARTIK530-Wifi
+building-blocks-sub1-Preset_partition-3parts_ramdisk_recovery
+# For TCT
+building-blocks-sub2-domain_API-AppFramework-TPK_Installation
+
+# multi assistant
+building-blocks-sub2-domain_API-UIX-Multi_assistant
+building-blocks-sub2-Preset_boards-ARTIK530-Audio_Recording
diff --git a/mapping-bb-rs.xml b/mapping-bb-rs.xml
index a8fd971..1d2891e 100644
--- a/mapping-bb-rs.xml
+++ b/mapping-bb-rs.xml
@@ -508,6 +508,9 @@
<buildingblock name="building-blocks-sub2-domain_API-UIX-Voice_control_elementary">
<rs_info>voice-control-elm-rs.xml</rs_info>
</buildingblock>
+ <buildingblock name="building-blocks-sub2-domain_API-UIX-Multi_assistant">
+ <rs_info>multi-assistant-rs.xml</rs_info>
+ </buildingblock>
<buildingblock name="building-blocks-sub2-domain_API-Web-WebView">
<rs_info>chromium-efl-rs.xml</rs_info>
<rs_info>evas-rs.xml</rs_info>
diff --git a/mapping-bb-tct.xml b/mapping-bb-tct.xml
index 18e479c..2093768 100644
--- a/mapping-bb-tct.xml
+++ b/mapping-bb-tct.xml
@@ -452,4 +452,9 @@
<bb_info>building-blocks-sub2-domain_API-UIX-Voice_control_elementary</bb_info>
<precondition>wifi</precondition>
</imageid>
+ <imageid name="TC0048">
+ <tct_info>tct-multi-assistant-native-utc</tct_info>
+ <bb_info>building-blocks-sub2-domain_API-UIX-Multi_assistant</bb_info>
+ <precondition>wifi</precondition>
+ </imageid>
</MappingInfo>
diff --git a/packaging/domain-apis-uix.inc b/packaging/domain-apis-uix.inc
index 92eb323..f1e5a03 100644
--- a/packaging/domain-apis-uix.inc
+++ b/packaging/domain-apis-uix.inc
@@ -12,6 +12,7 @@ Suggests: %{name}-sub2-domain_API-UIX-STT
Suggests: %{name}-sub2-domain_API-UIX-TTS
Suggests: %{name}-sub2-domain_API-UIX-Voice_control
Suggests: %{name}-sub2-domain_API-UIX-Voice_control_elementary
+Suggests: %{name}-sub2-domain_API-UIX-Multi_assistant
%description sub1-domain_API-UIX
Tizen block (set of packages) for Group of domain API-UIX
%files sub1-domain_API-UIX
@@ -118,3 +119,16 @@ Voice control elementary provides functions to control widget by voice commands.
%posttrans sub2-domain_API-UIX-Voice_control_elementary
%tizen_feature tizen.org/feature/speech.control true
+%package sub2-domain_API-UIX-Multi_assistant
+Summary: Multi_assistant
+
+Requires: multi-assistant
+Requires: org.tizen.multi-assistant-service
+Requires: %{name}-sub2-domain_API-Multimedia-Audio_IO
+
+%description sub2-domain_API-UIX-Multi_assistant
+Multi assistant supports various AI assistants on the same time for giving a better usability and provides common interface for making an assistant of multi-assistant framework.
+
+%files sub2-domain_API-UIX-Multi_assistant
+%posttrans sub2-domain_API-UIX-Multi_assistant
+%tizen_feature tizen.org/feature/multi_assistant true
diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc
index 5187a7e..a2eecc0 100644
--- a/packaging/platform-preset-iot.inc
+++ b/packaging/platform-preset-iot.inc
@@ -179,6 +179,7 @@ Requires: %{name}-sub2-domain_API-UIX-STT
Requires: %{name}-sub2-domain_API-UIX-TTS
Requires: %{name}-sub2-domain_API-UIX-Voice_control
Requires: %{name}-sub2-domain_API-UIX-Voice_control_elementary
+Requires: %{name}-sub2-domain_API-UIX-Multi_assistant
Requires: %{name}-sub2-domain_API-Web-WebView
Requires: %{name}-sub1-domain_Feature-Resource_manager