From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Thu, 4 Aug 2016 06:25:20 +0000 (+0900)
Subject: Merge branch 'develop' into develop_qemu_2.6
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~30^2~6^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a67fdc8e6cb9f21cb2954207aad43b3cfaf86054;p=sdk%2Femulator%2Fqemu.git

Merge branch 'develop' into develop_qemu_2.6
---

a67fdc8e6cb9f21cb2954207aad43b3cfaf86054
diff --cc tizen/src/ecs/Makefile.objs
index 36ab220abd,b0a65aebe8..9276dd90cd
--- a/tizen/src/ecs/Makefile.objs
+++ b/tizen/src/ecs/Makefile.objs
@@@ -3,6 -3,6 +3,6 @@@ obj-y += ecs.o ecs_msg.o ecs_msg_inject
  obj-y += ecs_mon.o ecs-json-streamer.o
  obj-y += ecs_eventcast.o
  obj-y += ecs_sensor.o
 -obj-y += ecs_hds.o
 +obj-$(CONFIG_VIRTFS) += ecs_hds.o
  obj-y += ecs_nfc.o
- obj-y += ecs_sdcard.o
+ obj-y += ecs_sdcard.o