146 files changed, 4 insertions, 6 deletions
diff --git a/aries/Android.mk b/Android.mk
index c32db09..9f8167c 100644
--- a/aries/Android.mk
+++ b/Android.mk
@@ -1,3 +1,5 @@
+ifeq ($(filter-out aries,$(TARGET_BOOTLOADER_BOARD_NAME)),)
 ifeq ($(filter-out s5pv210,$(TARGET_BOARD_PLATFORM)),)
     include $(all-subdir-makefiles)
 endif
+endif
diff --git a/aries.mk b/aries.mk
deleted file mode 100644
index f1fe55b..0000000
--- a/aries.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-ifeq ($(filter-out aries,$(TARGET_BOOTLOADER_BOARD_NAME)),)
-    include device/samsung/common/aries/Android.mk
-endif
diff --git a/aries/bmlutils/Android.mk b/bmlutils/Android.mk
index cb7ec37..cb7ec37 100644
--- a/aries/bmlutils/Android.mk
+++ b/bmlutils/Android.mk
diff --git a/aries/bmlutils/bmlwrite.c b/bmlutils/bmlwrite.c
index 74860c6..74860c6 100644
--- a/aries/bmlutils/bmlwrite.c
+++ b/bmlutils/bmlwrite.c
diff --git a/aries/include/s3c_bc.h b/include/s3c_bc.h
index e8ea490..e8ea490 100755
--- a/aries/include/s3c_bc.h
+++ b/include/s3c_bc.h
diff --git a/aries/include/s3c_mem.h b/include/s3c_mem.h
index d51398a..d51398a 100755
--- a/aries/include/s3c_mem.h
+++ b/include/s3c_mem.h
diff --git a/aries/include/s5p_fimc.h b/include/s5p_fimc.h
index d2c760c..d2c760c 100755
--- a/aries/include/s5p_fimc.h
+++ b/include/s5p_fimc.h
diff --git a/aries/include/videodev2_samsung.h b/include/videodev2_samsung.h
index 0a7d7c3..0a7d7c3 100755
--- a/aries/include/videodev2_samsung.h
+++ b/include/videodev2_samsung.h
diff --git a/aries/libaudio/Android.mk b/libaudio/Android.mk
index 43f2ad8..43f2ad8 100644
--- a/aries/libaudio/Android.mk
+++ b/libaudio/Android.mk
diff --git a/aries/libaudio/AudioHardware.cpp b/libaudio/AudioHardware.cpp
index 45f0a2d..45f0a2d 100644
--- a/aries/libaudio/AudioHardware.cpp
+++ b/libaudio/AudioHardware.cpp
diff --git a/aries/libaudio/AudioHardware.h b/libaudio/AudioHardware.h
index a23e6c9..a23e6c9 100644
--- a/aries/libaudio/AudioHardware.h
+++ b/libaudio/AudioHardware.h
diff --git a/aries/libaudio/AudioPolicyManager.cpp b/libaudio/AudioPolicyManager.cpp
index c53d1e9..c53d1e9 100644
--- a/aries/libaudio/AudioPolicyManager.cpp
+++ b/libaudio/AudioPolicyManager.cpp
diff --git a/aries/libaudio/AudioPolicyManager.h b/libaudio/AudioPolicyManager.h
index 03141e5..03141e5 100644
--- a/aries/libaudio/AudioPolicyManager.h
+++ b/libaudio/AudioPolicyManager.h
diff --git a/aries/libaudio/alsa_audio.h b/libaudio/alsa_audio.h
index 3cb86d9..3cb86d9 100644
--- a/aries/libaudio/alsa_audio.h
+++ b/libaudio/alsa_audio.h
diff --git a/aries/libaudio/alsa_mixer.c b/libaudio/alsa_mixer.c
index 3036ef8..3036ef8 100644
--- a/aries/libaudio/alsa_mixer.c
+++ b/libaudio/alsa_mixer.c
diff --git a/aries/libaudio/alsa_pcm.c b/libaudio/alsa_pcm.c
index 5673391..5673391 100644
--- a/aries/libaudio/alsa_pcm.c
+++ b/libaudio/alsa_pcm.c
diff --git a/aries/libaudio/amix.c b/libaudio/amix.c
index d978caa..d978caa 100644
--- a/aries/libaudio/amix.c
+++ b/libaudio/amix.c
diff --git a/aries/libaudio/aplay.c b/libaudio/aplay.c
index 0ac0ac0..0ac0ac0 100644
--- a/aries/libaudio/aplay.c
+++ b/libaudio/aplay.c
diff --git a/aries/libaudio/arec.c b/libaudio/arec.c
index b1e9eda..b1e9eda 100644
--- a/aries/libaudio/arec.c
+++ b/libaudio/arec.c
diff --git a/aries/libaudio/asound.h b/libaudio/asound.h
index 6a17f29..6a17f29 100644
--- a/aries/libaudio/asound.h
+++ b/libaudio/asound.h
diff --git a/aries/libaudio/secril-client.h b/libaudio/secril-client.h
index 7bbaa03..7bbaa03 100644
--- a/aries/libaudio/secril-client.h
+++ b/libaudio/secril-client.h
diff --git a/aries/libcamera/Android.mk b/libcamera/Android.mk
index f4b41bb..f4b41bb 100644
--- a/aries/libcamera/Android.mk
+++ b/libcamera/Android.mk
diff --git a/aries/libcamera/NOTICE b/libcamera/NOTICE
index f921593..f921593 100644
--- a/aries/libcamera/NOTICE
+++ b/libcamera/NOTICE
diff --git a/aries/libcamera/SecCamera.cpp b/libcamera/SecCamera.cpp
index 4bd3fc7..4bd3fc7 100644
--- a/aries/libcamera/SecCamera.cpp
+++ b/libcamera/SecCamera.cpp
diff --git a/aries/libcamera/SecCamera.h b/libcamera/SecCamera.h
index b846201..b846201 100644
--- a/aries/libcamera/SecCamera.h
+++ b/libcamera/SecCamera.h
diff --git a/aries/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp
index f019e01..f019e01 100644
--- a/aries/libcamera/SecCameraHWInterface.cpp
+++ b/libcamera/SecCameraHWInterface.cpp
diff --git a/aries/libcamera/SecCameraHWInterface.h b/libcamera/SecCameraHWInterface.h
index 75526c6..75526c6 100644
--- a/aries/libcamera/SecCameraHWInterface.h
+++ b/libcamera/SecCameraHWInterface.h
diff --git a/aries/liblight/Android.mk b/liblight/Android.mk
index 9933c34..9933c34 100644
--- a/aries/liblight/Android.mk
+++ b/liblight/Android.mk
diff --git a/aries/liblight/NOTICE b/liblight/NOTICE
index f921593..f921593 100644
--- a/aries/liblight/NOTICE
+++ b/liblight/NOTICE
diff --git a/aries/liblight/lights.c b/liblight/lights.c
index 118fa66..118fa66 100644
--- a/aries/liblight/lights.c
+++ b/liblight/lights.c
diff --git a/aries/liboverlay/Android.mk b/liboverlay/Android.mk
index c4de48c..c4de48c 100644
--- a/aries/liboverlay/Android.mk
+++ b/liboverlay/Android.mk
diff --git a/aries/liboverlay/overlay.cpp b/liboverlay/overlay.cpp
index d0a4289..d0a4289 100644
--- a/aries/liboverlay/overlay.cpp
+++ b/liboverlay/overlay.cpp
diff --git a/aries/liboverlay/v4l2_utils.c b/liboverlay/v4l2_utils.c
index f3ebbc2..f3ebbc2 100644
--- a/aries/liboverlay/v4l2_utils.c
+++ b/liboverlay/v4l2_utils.c
diff --git a/aries/liboverlay/v4l2_utils.h b/liboverlay/v4l2_utils.h
index 02797c3..02797c3 100644
--- a/aries/liboverlay/v4l2_utils.h
+++ b/liboverlay/v4l2_utils.h
diff --git a/aries/libs3cjpeg/Android.mk b/libs3cjpeg/Android.mk
index 7a1acd6..7a1acd6 100644
--- a/aries/libs3cjpeg/Android.mk
+++ b/libs3cjpeg/Android.mk
diff --git a/aries/libs3cjpeg/Exif.h b/libs3cjpeg/Exif.h
index 96e11dd..96e11dd 100644
--- a/aries/libs3cjpeg/Exif.h
+++ b/libs3cjpeg/Exif.h
diff --git a/aries/libs3cjpeg/JpegEncoder.cpp b/libs3cjpeg/JpegEncoder.cpp
index 1361bca..1361bca 100644
--- a/aries/libs3cjpeg/JpegEncoder.cpp
+++ b/libs3cjpeg/JpegEncoder.cpp
diff --git a/aries/libs3cjpeg/JpegEncoder.h b/libs3cjpeg/JpegEncoder.h
index b95b1b1..b95b1b1 100644
--- a/aries/libs3cjpeg/JpegEncoder.h
+++ b/libs3cjpeg/JpegEncoder.h
diff --git a/aries/libsensors/Android.mk b/libsensors/Android.mk
index 228bfe7..228bfe7 100644
--- a/aries/libsensors/Android.mk
+++ b/libsensors/Android.mk
diff --git a/aries/libsensors/BoschYamaha.cpp b/libsensors/BoschYamaha.cpp
index ba88ff9..ba88ff9 100644
--- a/aries/libsensors/BoschYamaha.cpp
+++ b/libsensors/BoschYamaha.cpp
diff --git a/aries/libsensors/BoschYamaha.h b/libsensors/BoschYamaha.h
index 52af86b..52af86b 100644
--- a/aries/libsensors/BoschYamaha.h
+++ b/libsensors/BoschYamaha.h
diff --git a/aries/libsensors/CompassSensor.cpp b/libsensors/CompassSensor.cpp
index c4b6822..c4b6822 100644
--- a/aries/libsensors/CompassSensor.cpp
+++ b/libsensors/CompassSensor.cpp
diff --git a/aries/libsensors/CompassSensor.h b/libsensors/CompassSensor.h
index 0270431..0270431 100644
--- a/aries/libsensors/CompassSensor.h
+++ b/libsensors/CompassSensor.h
diff --git a/aries/libsensors/GyroSensor.cpp b/libsensors/GyroSensor.cpp
index 11df71e..11df71e 100644
--- a/aries/libsensors/GyroSensor.cpp
+++ b/libsensors/GyroSensor.cpp
diff --git a/aries/libsensors/GyroSensor.h b/libsensors/GyroSensor.h
index 1b206bd..1b206bd 100644
--- a/aries/libsensors/GyroSensor.h
+++ b/libsensors/GyroSensor.h
diff --git a/aries/libsensors/InputEventReader.cpp b/libsensors/InputEventReader.cpp
index c6bac93..c6bac93 100644
--- a/aries/libsensors/InputEventReader.cpp
+++ b/libsensors/InputEventReader.cpp
diff --git a/aries/libsensors/InputEventReader.h b/libsensors/InputEventReader.h
index fbf5121..fbf5121 100644
--- a/aries/libsensors/InputEventReader.h
+++ b/libsensors/InputEventReader.h
diff --git a/aries/libsensors/LightSensor.cpp b/libsensors/LightSensor.cpp
index ea3e250..ea3e250 100644
--- a/aries/libsensors/LightSensor.cpp
+++ b/libsensors/LightSensor.cpp
diff --git a/aries/libsensors/LightSensor.h b/libsensors/LightSensor.h
index cc1a00d..cc1a00d 100644
--- a/aries/libsensors/LightSensor.h
+++ b/libsensors/LightSensor.h
diff --git a/aries/libsensors/OrientationSensor.cpp b/libsensors/OrientationSensor.cpp
index 3fb5d29..3fb5d29 100644
--- a/aries/libsensors/OrientationSensor.cpp
+++ b/libsensors/OrientationSensor.cpp
diff --git a/aries/libsensors/OrientationSensor.h b/libsensors/OrientationSensor.h
index cbb7064..cbb7064 100644
--- a/aries/libsensors/OrientationSensor.h
+++ b/libsensors/OrientationSensor.h
diff --git a/aries/libsensors/ProximitySensor.cpp b/libsensors/ProximitySensor.cpp
index f7151ee..f7151ee 100644
--- a/aries/libsensors/ProximitySensor.cpp
+++ b/libsensors/ProximitySensor.cpp
diff --git a/aries/libsensors/ProximitySensor.h b/libsensors/ProximitySensor.h
index e9f782f..e9f782f 100644
--- a/aries/libsensors/ProximitySensor.h
+++ b/libsensors/ProximitySensor.h
diff --git a/aries/libsensors/SensorBase.cpp b/libsensors/SensorBase.cpp
index 2fe5c2d..2fe5c2d 100644
--- a/aries/libsensors/SensorBase.cpp
+++ b/libsensors/SensorBase.cpp
diff --git a/aries/libsensors/SensorBase.h b/libsensors/SensorBase.h
index 6b4b555..6b4b555 100644
--- a/aries/libsensors/SensorBase.h
+++ b/libsensors/SensorBase.h
diff --git a/aries/libsensors/Smb380Sensor.cpp b/libsensors/Smb380Sensor.cpp
index 3de4d9b..3de4d9b 100644
--- a/aries/libsensors/Smb380Sensor.cpp
+++ b/libsensors/Smb380Sensor.cpp
diff --git a/aries/libsensors/Smb380Sensor.h b/libsensors/Smb380Sensor.h
index 5e55e9b..5e55e9b 100644
--- a/aries/libsensors/Smb380Sensor.h
+++ b/libsensors/Smb380Sensor.h
diff --git a/aries/libsensors/sensors.cpp b/libsensors/sensors.cpp
index 2358a2e..2358a2e 100644
--- a/aries/libsensors/sensors.cpp
+++ b/libsensors/sensors.cpp
diff --git a/aries/libsensors/sensors.h b/libsensors/sensors.h
index 4943fc1..4943fc1 100644
--- a/aries/libsensors/sensors.h
+++ b/libsensors/sensors.h
diff --git a/aries/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk
index 7716541..7716541 100644
--- a/aries/libstagefrighthw/Android.mk
+++ b/libstagefrighthw/Android.mk
diff --git a/aries/libstagefrighthw/SEC_OMX_Plugin.cpp b/libstagefrighthw/SEC_OMX_Plugin.cpp
index 0bb70c5..0bb70c5 100644
--- a/aries/libstagefrighthw/SEC_OMX_Plugin.cpp
+++ b/libstagefrighthw/SEC_OMX_Plugin.cpp
diff --git a/aries/libstagefrighthw/SEC_OMX_Plugin.h b/libstagefrighthw/SEC_OMX_Plugin.h
index 6df2d31..6df2d31 100644
--- a/aries/libstagefrighthw/SEC_OMX_Plugin.h
+++ b/libstagefrighthw/SEC_OMX_Plugin.h
diff --git a/aries/libstagefrighthw/SecHardwareRenderer.cpp b/libstagefrighthw/SecHardwareRenderer.cpp
index cb9e8e8..cb9e8e8 100644
--- a/aries/libstagefrighthw/SecHardwareRenderer.cpp
+++ b/libstagefrighthw/SecHardwareRenderer.cpp
diff --git a/aries/libstagefrighthw/SecHardwareRenderer.h b/libstagefrighthw/SecHardwareRenderer.h
index 3fad243..3fad243 100644
--- a/aries/libstagefrighthw/SecHardwareRenderer.h
+++ b/libstagefrighthw/SecHardwareRenderer.h
diff --git a/aries/libstagefrighthw/stagefright_overlay_output.cpp b/libstagefrighthw/stagefright_overlay_output.cpp
index fce1d7e..fce1d7e 100644
--- a/aries/libstagefrighthw/stagefright_overlay_output.cpp
+++ b/libstagefrighthw/stagefright_overlay_output.cpp
diff --git a/aries/mkshbootimg.py b/mkshbootimg.py
index dcc8294..dcc8294 100755
--- a/aries/mkshbootimg.py
+++ b/mkshbootimg.py
diff --git a/aries/sec_mm/Android.mk b/sec_mm/Android.mk
index 6571161..6571161 100644
--- a/aries/sec_mm/Android.mk
+++ b/sec_mm/Android.mk
diff --git a/aries/sec_mm/sec_omx/Android.mk b/sec_mm/sec_omx/Android.mk
index cbae428..cbae428 100644
--- a/aries/sec_mm/sec_omx/Android.mk
+++ b/sec_mm/sec_omx/Android.mk
diff --git a/aries/sec_mm/sec_omx/sec_codecs/Android.mk b/sec_mm/sec_omx/sec_codecs/Android.mk
index a51a075..a51a075 100644
--- a/aries/sec_mm/sec_omx/sec_codecs/Android.mk
+++ b/sec_mm/sec_omx/sec_codecs/Android.mk
diff --git a/aries/sec_mm/sec_omx/sec_codecs/video/mfc_c110/dec/Android.mk b/sec_mm/sec_omx/sec_codecs/video/mfc_c110/dec/Android.mk
index a694deb..a694deb 100644
--- a/aries/sec_mm/sec_omx/sec_codecs/video/mfc_c110/dec/Android.mk
+++ b/sec_mm/sec_omx/sec_codecs/video/mfc_c110/dec/Android.mk
diff --git a/aries/sec_mm/sec_omx/sec_codecs/video/mfc_c110/dec/src/SsbSipMfcDecAPI.c b/sec_mm/sec_omx/sec_codecs/video/mfc_c110/dec/src/SsbSipMfcDecAPI.c
index 508f290..508f290 100644
--- a/aries/sec_mm/sec_omx/sec_codecs/video/mfc_c110/dec/src/SsbSipMfcDecAPI.c
+++ b/sec_mm/sec_omx/sec_codecs/video/mfc_c110/dec/src/SsbSipMfcDecAPI.c
diff --git a/aries/sec_mm/sec_omx/sec_codecs/video/mfc_c110/enc/Android.mk b/sec_mm/sec_omx/sec_codecs/video/mfc_c110/enc/Android.mk
index e138a99..e138a99 100644
--- a/aries/sec_mm/sec_omx/sec_codecs/video/mfc_c110/enc/Android.mk
+++ b/sec_mm/sec_omx/sec_codecs/video/mfc_c110/enc/Android.mk
diff --git a/aries/sec_mm/sec_omx/sec_codecs/video/mfc_c110/enc/src/SsbSipMfcEncAPI.c b/sec_mm/sec_omx/sec_codecs/video/mfc_c110/enc/src/SsbSipMfcEncAPI.c
index 2c33c5b..2c33c5b 100644
--- a/aries/sec_mm/sec_omx/sec_codecs/video/mfc_c110/enc/src/SsbSipMfcEncAPI.c
+++ b/sec_mm/sec_omx/sec_codecs/video/mfc_c110/enc/src/SsbSipMfcEncAPI.c
diff --git a/aries/sec_mm/sec_omx/sec_codecs/video/mfc_c110/include/SsbSipMfcApi.h b/sec_mm/sec_omx/sec_codecs/video/mfc_c110/include/SsbSipMfcApi.h
index e083998..e083998 100644
--- a/aries/sec_mm/sec_omx/sec_codecs/video/mfc_c110/include/SsbSipMfcApi.h
+++ b/sec_mm/sec_omx/sec_codecs/video/mfc_c110/include/SsbSipMfcApi.h
diff --git a/aries/sec_mm/sec_omx/sec_codecs/video/mfc_c110/include/mfc_interface.h b/sec_mm/sec_omx/sec_codecs/video/mfc_c110/include/mfc_interface.h
index e7e23c3..e7e23c3 100644
--- a/aries/sec_mm/sec_omx/sec_codecs/video/mfc_c110/include/mfc_interface.h
+++ b/sec_mm/sec_omx/sec_codecs/video/mfc_c110/include/mfc_interface.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/common/Android.mk b/sec_mm/sec_omx/sec_omx_component/common/Android.mk
index 6633682..6633682 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/common/Android.mk
+++ b/sec_mm/sec_omx/sec_omx_component/common/Android.mk
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Basecomponent.c b/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Basecomponent.c
index d1b224f..d1b224f 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Basecomponent.c
+++ b/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Basecomponent.c
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Basecomponent.h b/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Basecomponent.h
index d413257..d413257 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Basecomponent.h
+++ b/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Basecomponent.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Baseport.c b/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Baseport.c
index 0e0f7ea..0e0f7ea 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Baseport.c
+++ b/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Baseport.c
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Baseport.h b/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Baseport.h
index f38226b..f38226b 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Baseport.h
+++ b/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Baseport.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Resourcemanager.c b/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Resourcemanager.c
index 41673ad..41673ad 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Resourcemanager.c
+++ b/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Resourcemanager.c
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Resourcemanager.h b/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Resourcemanager.h
index b958575..b958575 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Resourcemanager.h
+++ b/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Resourcemanager.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/Android.mk b/sec_mm/sec_omx/sec_omx_component/video/dec/Android.mk
index 401449b..401449b 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/Android.mk
+++ b/sec_mm/sec_omx/sec_omx_component/video/dec/Android.mk
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/SEC_OMX_Vdec.c b/sec_mm/sec_omx/sec_omx_component/video/dec/SEC_OMX_Vdec.c
index 48705c1..48705c1 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/SEC_OMX_Vdec.c
+++ b/sec_mm/sec_omx/sec_omx_component/video/dec/SEC_OMX_Vdec.c
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/SEC_OMX_Vdec.h b/sec_mm/sec_omx/sec_omx_component/video/dec/SEC_OMX_Vdec.h
index b7f71da..b7f71da 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/SEC_OMX_Vdec.h
+++ b/sec_mm/sec_omx/sec_omx_component/video/dec/SEC_OMX_Vdec.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/Android.mk b/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/Android.mk
index 2dadf50..2dadf50 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/Android.mk
+++ b/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/Android.mk
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/SEC_OMX_H264dec.c b/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/SEC_OMX_H264dec.c
index 5e73b7f..5e73b7f 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/SEC_OMX_H264dec.c
+++ b/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/SEC_OMX_H264dec.c
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/SEC_OMX_H264dec.h b/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/SEC_OMX_H264dec.h
index b1374fb..b1374fb 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/SEC_OMX_H264dec.h
+++ b/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/SEC_OMX_H264dec.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/library_register.c b/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/library_register.c
index f7bcf25..f7bcf25 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/library_register.c
+++ b/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/library_register.c
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/library_register.h b/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/library_register.h
index cdbfaa4..cdbfaa4 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/library_register.h
+++ b/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/library_register.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/Android.mk b/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/Android.mk
index a3a3c0c..a3a3c0c 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/Android.mk
+++ b/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/Android.mk
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/SEC_OMX_Mpeg4dec.c b/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/SEC_OMX_Mpeg4dec.c
index 5074214..5074214 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/SEC_OMX_Mpeg4dec.c
+++ b/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/SEC_OMX_Mpeg4dec.c
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/SEC_OMX_Mpeg4dec.h b/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/SEC_OMX_Mpeg4dec.h
index 25170b8..25170b8 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/SEC_OMX_Mpeg4dec.h
+++ b/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/SEC_OMX_Mpeg4dec.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/library_register.c b/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/library_register.c
index 89b856d..89b856d 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/library_register.c
+++ b/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/library_register.c
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/library_register.h b/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/library_register.h
index e9bcfe8..e9bcfe8 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/library_register.h
+++ b/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/library_register.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/Android.mk b/sec_mm/sec_omx/sec_omx_component/video/enc/Android.mk
index e9ca8e7..e9ca8e7 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/Android.mk
+++ b/sec_mm/sec_omx/sec_omx_component/video/enc/Android.mk
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/SEC_OMX_Venc.c b/sec_mm/sec_omx/sec_omx_component/video/enc/SEC_OMX_Venc.c
index eff5dec..eff5dec 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/SEC_OMX_Venc.c
+++ b/sec_mm/sec_omx/sec_omx_component/video/enc/SEC_OMX_Venc.c
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/SEC_OMX_Venc.h b/sec_mm/sec_omx/sec_omx_component/video/enc/SEC_OMX_Venc.h
index 93d2800..93d2800 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/SEC_OMX_Venc.h
+++ b/sec_mm/sec_omx/sec_omx_component/video/enc/SEC_OMX_Venc.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/Android.mk b/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/Android.mk
index 0a469d4..0a469d4 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/Android.mk
+++ b/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/Android.mk
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/SEC_OMX_H264enc.c b/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/SEC_OMX_H264enc.c
index 239649e..239649e 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/SEC_OMX_H264enc.c
+++ b/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/SEC_OMX_H264enc.c
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/SEC_OMX_H264enc.h b/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/SEC_OMX_H264enc.h
index 80f6260..80f6260 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/SEC_OMX_H264enc.h
+++ b/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/SEC_OMX_H264enc.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/library_register.c b/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/library_register.c
index ee1ea0a..ee1ea0a 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/library_register.c
+++ b/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/library_register.c
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/library_register.h b/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/library_register.h
index 71397ef..71397ef 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/library_register.h
+++ b/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/library_register.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/Android.mk b/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/Android.mk
index 979c34a..979c34a 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/Android.mk
+++ b/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/Android.mk
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/SEC_OMX_Mpeg4enc.c b/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/SEC_OMX_Mpeg4enc.c
index 0596c25..0596c25 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/SEC_OMX_Mpeg4enc.c
+++ b/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/SEC_OMX_Mpeg4enc.c
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/SEC_OMX_Mpeg4enc.h b/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/SEC_OMX_Mpeg4enc.h
index d4f9038..d4f9038 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/SEC_OMX_Mpeg4enc.h
+++ b/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/SEC_OMX_Mpeg4enc.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/library_register.c b/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/library_register.c
index 20e4eb8..20e4eb8 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/library_register.c
+++ b/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/library_register.c
diff --git a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/library_register.h b/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/library_register.h
index 3b23011..3b23011 100644
--- a/aries/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/library_register.h
+++ b/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/library_register.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_core/Android.mk b/sec_mm/sec_omx/sec_omx_core/Android.mk
index cb01274..cb01274 100644
--- a/aries/sec_mm/sec_omx/sec_omx_core/Android.mk
+++ b/sec_mm/sec_omx/sec_omx_core/Android.mk
diff --git a/aries/sec_mm/sec_omx/sec_omx_core/SEC_OMX_Component_Register.c b/sec_mm/sec_omx/sec_omx_core/SEC_OMX_Component_Register.c
index 1464397..1464397 100644
--- a/aries/sec_mm/sec_omx/sec_omx_core/SEC_OMX_Component_Register.c
+++ b/sec_mm/sec_omx/sec_omx_core/SEC_OMX_Component_Register.c
diff --git a/aries/sec_mm/sec_omx/sec_omx_core/SEC_OMX_Component_Register.h b/sec_mm/sec_omx/sec_omx_core/SEC_OMX_Component_Register.h
index 66580bd..66580bd 100644
--- a/aries/sec_mm/sec_omx/sec_omx_core/SEC_OMX_Component_Register.h
+++ b/sec_mm/sec_omx/sec_omx_core/SEC_OMX_Component_Register.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_core/SEC_OMX_Core.c b/sec_mm/sec_omx/sec_omx_core/SEC_OMX_Core.c
index fe84d8d..fe84d8d 100644
--- a/aries/sec_mm/sec_omx/sec_omx_core/SEC_OMX_Core.c
+++ b/sec_mm/sec_omx/sec_omx_core/SEC_OMX_Core.c
diff --git a/aries/sec_mm/sec_omx/sec_omx_core/SEC_OMX_Core.h b/sec_mm/sec_omx/sec_omx_core/SEC_OMX_Core.h
index 87f561c..87f561c 100644
--- a/aries/sec_mm/sec_omx/sec_omx_core/SEC_OMX_Core.h
+++ b/sec_mm/sec_omx/sec_omx_core/SEC_OMX_Core.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_core/secomxregistry b/sec_mm/sec_omx/sec_omx_core/secomxregistry
index cc762e6..cc762e6 100644
--- a/aries/sec_mm/sec_omx/sec_omx_core/secomxregistry
+++ b/sec_mm/sec_omx/sec_omx_core/secomxregistry
diff --git a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Audio.h b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Audio.h
index 04f1a99..04f1a99 100644
--- a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Audio.h
+++ b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Audio.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Component.h b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Component.h
index d595640..d595640 100644
--- a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Component.h
+++ b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Component.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_ContentPipe.h b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_ContentPipe.h
index 5f6310c..5f6310c 100644
--- a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_ContentPipe.h
+++ b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_ContentPipe.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Core.h b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Core.h
index a076f2f..a076f2f 100644
--- a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Core.h
+++ b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Core.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_IVCommon.h b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_IVCommon.h
index 4c4995c..4c4995c 100644
--- a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_IVCommon.h
+++ b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_IVCommon.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Image.h b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Image.h
index a6d4666..a6d4666 100644
--- a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Image.h
+++ b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Image.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Index.h b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Index.h
index 44d4ea7..44d4ea7 100644
--- a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Index.h
+++ b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Index.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Other.h b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Other.h
index caf7f38..caf7f38 100644
--- a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Other.h
+++ b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Other.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Types.h b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Types.h
index 31be916..31be916 100644
--- a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Types.h
+++ b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Types.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Video.h b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Video.h
index 163e450..163e450 100644
--- a/aries/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Video.h
+++ b/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Video.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_include/sec/SEC_OMX_Def.h b/sec_mm/sec_omx/sec_omx_include/sec/SEC_OMX_Def.h
index 10dd94d..10dd94d 100644
--- a/aries/sec_mm/sec_omx/sec_omx_include/sec/SEC_OMX_Def.h
+++ b/sec_mm/sec_omx/sec_omx_include/sec/SEC_OMX_Def.h
diff --git a/aries/sec_mm/sec_omx/sec_omx_include/sec/SEC_OMX_Macros.h b/sec_mm/sec_omx/sec_omx_include/sec/SEC_OMX_Macros.h
index b3bfda6..b3bfda6 100644
--- a/aries/sec_mm/sec_omx/sec_omx_include/sec/SEC_OMX_Macros.h
+++ b/sec_mm/sec_omx/sec_omx_include/sec/SEC_OMX_Macros.h
diff --git a/aries/sec_mm/sec_omx/sec_osal/Android.mk b/sec_mm/sec_omx/sec_osal/Android.mk
index b474876..b474876 100644
--- a/aries/sec_mm/sec_omx/sec_osal/Android.mk
+++ b/sec_mm/sec_omx/sec_osal/Android.mk
diff --git a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_ETC.c b/sec_mm/sec_omx/sec_osal/SEC_OSAL_ETC.c
index 66f8355..66f8355 100644
--- a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_ETC.c
+++ b/sec_mm/sec_omx/sec_osal/SEC_OSAL_ETC.c
diff --git a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_ETC.h b/sec_mm/sec_omx/sec_osal/SEC_OSAL_ETC.h
index 6c6ede7..6c6ede7 100644
--- a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_ETC.h
+++ b/sec_mm/sec_omx/sec_osal/SEC_OSAL_ETC.h
diff --git a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Event.c b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Event.c
index 51b3ca2..51b3ca2 100644
--- a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Event.c
+++ b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Event.c
diff --git a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Event.h b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Event.h
index 640d2cc..640d2cc 100644
--- a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Event.h
+++ b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Event.h
diff --git a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Library.c b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Library.c
index 06ac712..06ac712 100644
--- a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Library.c
+++ b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Library.c
diff --git a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Library.h b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Library.h
index 687cecd..687cecd 100644
--- a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Library.h
+++ b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Library.h
diff --git a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Log.c b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Log.c
index bae4974..bae4974 100644
--- a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Log.c
+++ b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Log.c
diff --git a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Log.h b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Log.h
index 2f8a6ce..2f8a6ce 100644
--- a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Log.h
+++ b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Log.h
diff --git a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Memory.c b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Memory.c
index 3579d92..3579d92 100644
--- a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Memory.c
+++ b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Memory.c
diff --git a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Memory.h b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Memory.h
index 3a12838..3a12838 100644
--- a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Memory.h
+++ b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Memory.h
diff --git a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Mutex.c b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Mutex.c
index 146809c..146809c 100644
--- a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Mutex.c
+++ b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Mutex.c
diff --git a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Mutex.h b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Mutex.h
index 70dcd9d..70dcd9d 100644
--- a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Mutex.h
+++ b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Mutex.h
diff --git a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Queue.c b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Queue.c
index 7a6c024..7a6c024 100644
--- a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Queue.c
+++ b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Queue.c
diff --git a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Queue.h b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Queue.h
index 68910cc..68910cc 100644
--- a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Queue.h
+++ b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Queue.h
diff --git a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Semaphore.c b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Semaphore.c
index 17a29a0..17a29a0 100644
--- a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Semaphore.c
+++ b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Semaphore.c
diff --git a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Semaphore.h b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Semaphore.h
index f23d3d6..f23d3d6 100644
--- a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Semaphore.h
+++ b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Semaphore.h
diff --git a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Thread.c b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Thread.c
index d488885..d488885 100644
--- a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Thread.c
+++ b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Thread.c
diff --git a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Thread.h b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Thread.h
index b932aef..b932aef 100644
--- a/aries/sec_mm/sec_omx/sec_osal/SEC_OSAL_Thread.h
+++ b/sec_mm/sec_omx/sec_osal/SEC_OSAL_Thread.h
diff --git a/aries/shbootimg.mk b/shbootimg.mk
index 4d44f92..16bb51f 100644
--- a/aries/shbootimg.mk
+++ b/shbootimg.mk
@@ -1,8 +1,7 @@
 INSTALLED_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img
-$(INSTALLED_BOOTIMAGE_TARGET): device/samsung/common/aries/mkshbootimg.py \
+$(INSTALLED_BOOTIMAGE_TARGET): device/samsung/aries-common/mkshbootimg.py \
 		$(TARGET_RECOVERY_COMPRESSED_INITRAMFS) \
 		$(BUILT_COMPRESSED_INITRAMFS_TARGET) \
 		$(TARGET_PREBUILT_KERNEL)
 	$(call pretty,"Boot image: $@")
-	$(hide) ./device/samsung/common/aries/mkshbootimg.py $@ $(TARGET_PREBUILT_KERNEL) $(BUILT_COMPRESSED_INITRAMFS_TARGET) $(TARGET_RECOVERY_COMPRESSED_INITRAMFS)
-	
+	$(hide) ./device/samsung/aries-common/mkshbootimg.py $@ $(TARGET_PREBUILT_KERNEL) $(BUILT_COMPRESSED_INITRAMFS_TARGET) $(TARGET_RECOVERY_COMPRESSED_INITRAMFS)