[TCT][TPK scripts, player, context,maps-service][NONACR][Fixed TPK scripts and 3...

Change-Id: Ica7173fea4adffade22728c853baa058ab025213
Signed-off-by: Shobhit Verma <shobhit.v@samsung.com>

diff --git a/packaging/itc/native-capi-maps-service-itc.xml b/packaging/itc/native-capi-maps-service-itc.xml
index 5985ced..b36415b 100755 (executable)
--- a/packaging/itc/native-capi-maps-service-itc.xml
+++ b/packaging/itc/native-capi-maps-service-itc.xml
@@ -11,6 +11,5 @@
                <privilege>http://tizen.org/privilege/network.profile</privilege>
            <privilege>http://tizen.org/privilege/network.get</privilege>
            <privilege>http://tizen.org/privilege/network.set</privilege>
-               <privilege>http://tizen.org/privilege/systemsettings</privilege>
     </privileges>
 </manifest>

diff --git a/packaging/itc/native-context-itc.xml b/packaging/itc/native-context-itc.xml
index 4a84c4a..a57b2ad 100755 (executable)
--- a/packaging/itc/native-context-itc.xml
+++ b/packaging/itc/native-context-itc.xml
@@ -16,7 +16,7 @@
                <privilege>http://tizen.org/privilege/callhistory.read</privilege>
                <privilege>http://tizen.org/privilege/apphistory.read</privilege>
                <privilege>http://tizen.org/privilege/mediahistory.read</privilege>
-               <privilege>http://tizen.org/privilege/contact.read </privilege>
-               <privilege>http://tizen.org/privilege/location </privilege>
+               <privilege>http://tizen.org/privilege/contact.read</privilege>
+               <privilege>http://tizen.org/privilege/location</privilege>
     </privileges>
 </manifest>

diff --git a/packaging/itc/native-player-itc.xml b/packaging/itc/native-player-itc.xml
index 0c48c8f..0bbf9e9 100755 (executable)
--- a/packaging/itc/native-player-itc.xml
+++ b/packaging/itc/native-player-itc.xml
@@ -6,8 +6,7 @@
     <ui-application appid="native.player-itc" exec="/usr/apps/native-player-itc/bin/tct-player-native" nodisplay="false" multiple="false" type="capp" taskmanage="true">
     </ui-application>
 <privileges>
-        <privilege>http://tizen.org/privilege/player</privilege>
-               <privilege>http://tizen.org/privilege/externalstorage</privilege>
+        <privilege>http://tizen.org/privilege/externalstorage</privilege>
         <privilege>http://tizen.org/privilege/mediastorage</privilege>
         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
         <privilege>http://tizen.org/privilege/content.write</privilege>

diff --git a/scripts_tpk/inst.sh b/scripts_tpk/inst.sh
index 7dd142f..9378825 100755 (executable)
--- a/scripts_tpk/inst.sh
+++ b/scripts_tpk/inst.sh
@@ -210,6 +210,47 @@ fi
 
     done
     rm -rf $DEVICE_SUITE_TARGET_30/res
+       
+       if [ -d $DEVICE_STORAGE_30/TestFolder ]; then
+               rm -rf $DEVICE_STORAGE_30/TestFolder
+       fi
+       if [ -f $DEVICE_STORAGE_30/TestImage.jpg ]; then
+               rm $DEVICE_STORAGE_30/TestImage.jpg
+       fi
+       if [ -f $DEVICE_STORAGE_30/Remove.jpg ]; then
+               rm $DEVICE_STORAGE_30/Remove.jpg
+       fi
+       if [ -f $DEVICE_STORAGE_30/Images/TestImage.jpg ]; then
+               rm $DEVICE_STORAGE_30/Images/TestImage.jpg
+       fi
+       if [ -f $DEVICE_STORAGE_30/TestAudio.mp3 ]; then
+               rm $DEVICE_STORAGE_30/TestAudio.mp3
+       fi
+       if [ -f $DEVICE_STORAGE_30/Images/BookMarkImage.jpg ]; then
+               rm $DEVICE_STORAGE_30/Images/BookMarkImage.jpg
+       fi
+       if [ -f $DEVICE_STORAGE_30/Images/ThumbNailImage.jpg ]; then
+               rm $DEVICE_STORAGE_30/Images/ThumbNailImage.jpg
+       fi
+       if [ -f $DEVICE_STORAGE_30/Images/BurstImage1.jpg ]; then
+               rm $DEVICE_STORAGE_30/Images/BurstImage1.jpg
+       fi
+       if [ -f $DEVICE_STORAGE_30/Images/BurstImage2.jpg ]; then
+               rm $DEVICE_STORAGE_30/Images/BurstImage2.jpg
+       fi
+       if [ -f $DEVICE_STORAGE_30/Images/BurstImage3.jpg ]; then
+               rm $DEVICE_STORAGE_30/Images/BurstImage3.jpg
+       fi
+       if [ -f $DEVICE_STORAGE_30/Images/BurstImage4.jpg ]; then
+               rm $DEVICE_STORAGE_30/Images/BurstImage4.jpg
+       fi
+       if [ -f $DEVICE_STORAGE_30/Videos/TestVideo.mp4 ]; then
+               rm $DEVICE_STORAGE_30/Videos/TestVideo.mp4
+       fi
+       if [ -f $DEVICE_STORAGE_30/Music/TestAudio.mp3 ]; then
+               rm $DEVICE_STORAGE_30/Music/TestAudio.mp3
+       fi      
+       chmod -R 700 $DEVICE_STORAGE_30/Music
 }
  
  case "$1" in

diff --git a/scripts_tpk/tpk_create.sh b/scripts_tpk/tpk_create.sh
index d3fbef0..82b245a 100755 (executable)
--- a/scripts_tpk/tpk_create.sh
+++ b/scripts_tpk/tpk_create.sh
@@ -244,6 +244,14 @@ deploySourceFile() {
                fi
        fi
        
+       if [ $MODULE_NAME == "context" ]; then
+               if [ "$5" == "utc" ]; then
+                       sed -i -e 's/core-context-tests/org.tizen.context-native-utc/g' $1/inc/utc-context-trigger-custom.h
+               elif [ "$5" == "itc" ]; then
+                       sed -i -e 's/native-context-itc/org.tizen.context-native-itc/g' $1/inc/ITs-context-common.h
+               fi
+       fi
+
        if [ $MODULE_NAME == "accounts-svc" ]; then
                if [ "$5" == "utc" ]; then
                        sed -i -e 's:/usr/apps/core-accounts-svc-tests/:/home/owner/app_rw/org.tizen.accounts-svc-native-utc/:g' $1/src/utc-accounts-svc.c