[TBT][tbtcoreapp][Non-ACR][DPTTIZEN-2947,Removed d2d-con-manager tc] 28/157728/2 tizen_3.0_mobile
authornibha2 <nibha.sharma@samsung.com>
Thu, 26 Oct 2017 04:32:56 +0000 (10:02 +0530)
committerNibha Sharma <nibha.sharma@samsung.com>
Thu, 26 Oct 2017 05:22:14 +0000 (05:22 +0000)
Change-Id: I6ec47201c01e9f68234a65114bd18ff97160d8ea
Signed-off-by: nibha2 <nibha.sharma@samsung.com>
release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk
release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk
tbtcoreapp/.cproject
tbtcoreapp/inc/model/tbt-info.h
tbtcoreapp/inc/utils/app_module_config.h
tbtcoreapp/res/edje/2.4/mobile/d2d_viewer.edc [deleted file]
tbtcoreapp/res/edje/3.0/mobile/d2d_viewer.edc [deleted file]
tbtcoreapp/src/model/tbt-list.c
tbtcoreapp/tizen-manifest.xml

index 2956119af5c11905aebd7ba23f68342ed6999a23..67258fce1a0a57bf845242c6052c667f6bf75017 100644 (file)
Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ
index eb1f2818e0d00f6977ca015b470cf8aca0853f87..d49f6de1ff0958c3220164a0d92cf4a7fe72f643 100644 (file)
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk differ
index ffd3c50089323d8e61c6175efa4313c2826a2579..e20c5daaa5cccd6271a9a92008d5945b428ac539 100644 (file)
                                                <toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug.966772140" name="Tizen Native Toolchain" superClass="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug">
                                                        <targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.1146520664" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
                                                        <builder autoBuildTarget="all" buildPath="${workspace_loc:/tbtcoreapp}/Debug" enableAutoBuild="true" id="org.tizen.nativecore.target.sbi.gnu.builder.482328865" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Tizen Application Builder" superClass="org.tizen.nativecore.target.sbi.gnu.builder"/>
-                                                       <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.921707253" name="Archiver" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver"/>
+                                                       <tool command="i386-linux-gnueabi-ar" id="org.tizen.nativecore.tool.sbi.gnu.archiver.921707253" name="Archiver" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver"/>
                                                        <tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.1141142708" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler">
                                                                <option id="gnu.cpp.compiler.option.optimization.level.1995167770" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.debugging.level.core.1231413559" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.94795005" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-3.0-emulator.core_llvm37.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-3.0-emulator.core_llvm40.i386"/>
                                                                </option>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1151584155" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
                                                                <option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.705018152" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
                                                                <option id="sbi.gnu.c.compiler.option.debugging.level.core.1866251786" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" value="gnu.c.debugging.level.max" valueType="enumerated"/>
                                                                <option id="sbi.gnu.c.compiler.option.828406008" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-3.0-emulator.core_llvm37.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-3.0-emulator.core_llvm40.i386"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.2054553498" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
                                                                        <additionalInput kind="additionalinput" paths="$(LIBS)"/>
                                                                </inputType>
                                                        </tool>
-                                                       <tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.692653264" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
+                                                       <tool command="#{PLATFORM_DEFAULT_GCC_PREFIX}as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.692653264" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
                                                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1386960240" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
                                                        </tool>
                                                        <tool id="org.tizen.nativecore.tool.fnmapgen.2050008912" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/>
                                                <toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.app.release.100788679" name="Tizen Native Toolchain" superClass="org.tizen.nativecore.toolchain.sbi.gcc45.app.release">
                                                        <targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.2024417825" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
                                                        <builder buildPath="${workspace_loc:/tbtcoreapp}/Release" id="org.tizen.nativecore.target.sbi.gnu.builder.262999466" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Tizen Application Builder" superClass="org.tizen.nativecore.target.sbi.gnu.builder"/>
-                                                       <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.1926911209" name="Archiver" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver"/>
+                                                       <tool command="i386-linux-gnueabi-ar" id="org.tizen.nativecore.tool.sbi.gnu.archiver.1926911209" name="Archiver" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver"/>
                                                        <tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.1390758993" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler">
                                                                <option id="gnu.cpp.compiler.option.optimization.level.491448994" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.debugging.level.core.570472136" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.1605381289" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-3.0-emulator.core_llvm37.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-3.0-emulator.core_llvm40.i386"/>
                                                                </option>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.117486491" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
                                                                <option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.option.optimization.level.1195619816" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
                                                                <option id="sbi.gnu.c.compiler.option.debugging.level.core.1479764417" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core"/>
                                                                <option id="sbi.gnu.c.compiler.option.789625662" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-3.0-emulator.core_llvm37.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-3.0-emulator.core_llvm40.i386"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1046681201" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
                                                                        <additionalInput kind="additionalinput" paths="$(LIBS)"/>
                                                                </inputType>
                                                        </tool>
-                                                       <tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1856546451" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
+                                                       <tool command="#{PLATFORM_DEFAULT_GCC_PREFIX}as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1856546451" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
                                                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1371467971" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
                                                        </tool>
                                                        <tool id="org.tizen.nativecore.tool.fnmapgen.318987509" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/>
index de6c189a87a7aaabf2252b2ffe2797354114a8aa..5982431b996075dafd7bc8853202d4ed47b043c3 100755 (executable)
@@ -240,10 +240,6 @@ typedef enum {
 
     TBT_APP_CONTACTS,
 
-    TBT_APP_D2D_CLIENT,
-
-    TBT_APP_D2D_SERVER,
-
     TBT_APP_TTS,
 
     TBT_APP_STT,
@@ -408,7 +404,6 @@ typedef enum
        FEATURE_CAMERA_FRONT_FLASH,
        FEATURE_CONSUMER_IR,
        FEATURE_CONTACT,
-       FEATURE_CONVERGENCE_D2D,
        FEATURE_DATABASE_ENCRYPTION,
        FEATURE_DATACONTROL,
        FEATURE_DATASYNC,
@@ -619,7 +614,6 @@ static char* feature_list[1024]=
        [FEATURE_CAMERA_FRONT_FLASH] = "tizen.org/feature/camera.front.flash",
        [FEATURE_CONSUMER_IR] = "tizen.org/feature/consumer_ir",
        [FEATURE_CONTACT] = "tizen.org/feature/contact",
-       [FEATURE_CONVERGENCE_D2D] = "tizen.org/feature/convergence.d2d",
        [FEATURE_DATABASE_ENCRYPTION] = "tizen.org/feature/database.encryption",
        [FEATURE_DATACONTROL] = "tizen.org/feature/datacontrol",
        [FEATURE_DATASYNC] = "tizen.org/feature/datasync",
index 3099ada1d46594dab7a43a402a8b96be0feaafbd..d20e9aaee5fc6be61df52912adb0b53795b033d3 100755 (executable)
 #define TBT_MODULE_CONTACTS
 #define TBT_MODULE_APP_CONTACTS
 
-#define TBT_MODULE_D2D
-#define TBT_MODULE_APP_D2D_CLIENT
-#define TBT_MODULE_APP_D2D_SERVER
-
 #define TBT_MODULE_TTS
 #define TBT_MODULE_APP_TTS
 #define TBT_MODULE_STT
diff --git a/tbtcoreapp/res/edje/2.4/mobile/d2d_viewer.edc b/tbtcoreapp/res/edje/2.4/mobile/d2d_viewer.edc
deleted file mode 100644 (file)
index 85772d8..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define TEXT_HEIGHT 0.08
-
-collections
-{
-    base_scale: 1.8;
-    group
-    {
-        name: "d2d_viewer";
-        parts{
-            part{
-                name: "list_container";
-                type: SWALLOW;
-                description{
-                    state: "default" 0.0;
-                    align: 0.0 0.0;
-                    visible: 1;
-                    rel1 {relative: 0.0 0.0; }
-                    rel2 {relative: 1.0 0.8; }
-                }
-            }
-            
-            part{
-                name: "others";
-                type: SWALLOW;
-                description{
-                    state: "default" 0.0;
-                    align: 0.0 0.0;
-                    visible: 1;
-                    rel1 {relative: 0.0 0.8; }
-                    rel2 {relative: 1.0 1.0; }
-                }
-            }
-        }
-    }
-}
diff --git a/tbtcoreapp/res/edje/3.0/mobile/d2d_viewer.edc b/tbtcoreapp/res/edje/3.0/mobile/d2d_viewer.edc
deleted file mode 100644 (file)
index 85772d8..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define TEXT_HEIGHT 0.08
-
-collections
-{
-    base_scale: 1.8;
-    group
-    {
-        name: "d2d_viewer";
-        parts{
-            part{
-                name: "list_container";
-                type: SWALLOW;
-                description{
-                    state: "default" 0.0;
-                    align: 0.0 0.0;
-                    visible: 1;
-                    rel1 {relative: 0.0 0.0; }
-                    rel2 {relative: 1.0 0.8; }
-                }
-            }
-            
-            part{
-                name: "others";
-                type: SWALLOW;
-                description{
-                    state: "default" 0.0;
-                    align: 0.0 0.0;
-                    visible: 1;
-                    rel1 {relative: 0.0 0.8; }
-                    rel2 {relative: 1.0 1.0; }
-                }
-            }
-        }
-    }
-}
index 31d3af3d91e2c69941d1ad06bd07901d527c8575..e970a7db1009362b3437f12ae2a500c317938ab4 100755 (executable)
@@ -2373,35 +2373,6 @@ static tbt_info tbtapps[] =
        #endif
 #endif
 
-#ifdef TBT_MODULE_D2D
-       #ifdef TBT_MODULE_APP_D2D_CLIENT
-
-               //NSD DNSSD
-               {
-                       .name = "D2D Client",
-                       .parent = "D2D Convergence",
-                       .apptype = TBT_APP_D2D_CLIENT,
-                       .icon_name = "dummy",
-                       .info = "1.     Connect <b>D2D Server</b> to Same WiFi Network.<br/>"
-                                       "2.     Run <b>D2D server</b> module of TBT.<br/>"
-                                       "3.     <b>/tizen/remote-app-control</b> will be shown<br/>"
-                                       "4.     Select <b>/tizen/remote-app-control</b>. Then <b>cortbt_uiapp</b> will be launch in <b>D2D Server</b>.<br/>",
-                       .result = 0
-               },
-       #endif
-       #ifdef TBT_MODULE_APP_D2D_SERVER
-               {
-                       .name = "D2D Server",
-                       .parent = "D2D Convergence",
-                       .apptype = TBT_APP_D2D_SERVER,
-                       .icon_name = "dummy",
-                       .info = "1.     Connect <b>D2D Client</b> to Same WiFi Network.<br/>"
-                                       "2.     Run D2D Server Module from TBT again.<br/>"
-                                       "3.     Server <b>Ready</b> Message will be shown",
-                       .result = 0
-               },
-       #endif
-#endif
 #ifdef TBT_MODULE_TTS
        #ifdef TBT_MODULE_APP_TTS
                {
index bc1dd06a16a58e30318a4b3843aef763928c7ffe..b41a3e91caf0a03e697ad0e312a9e769dfe63b76 100644 (file)
@@ -13,7 +13,6 @@
         <privilege>http://tizen.org/privilege/mediastorage</privilege>
         <privilege>http://tizen.org/privilege/callhistory.write</privilege>
         <privilege>http://tizen.org/privilege/network.get</privilege>
-        <privilege>http://tizen.org/privilege/d2d.datasharing</privilege>
         <privilege>http://tizen.org/privilege/bluetooth</privilege>
         <privilege>http://tizen.org/privilege/nfc</privilege>
         <privilege>http://tizen.org/privilege/callhistory.read</privilege>