Merge branch 'public-develop' into tizen_2.3
authorJinhyung Choi <jinhyung2.choi@samsung.com>
Fri, 13 Mar 2015 03:16:54 +0000 (12:16 +0900)
committerJinhyung Choi <jinhyung2.choi@samsung.com>
Fri, 13 Mar 2015 03:16:54 +0000 (12:16 +0900)
- deviced: booting done notification handling
- build: removed arm build
- added extra package installation

Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>
Conflicts:
CMakeLists.txt
include/emuld.h
include/mobile.h
include/synbuf.h
include/wearable.h
packaging/emuld.spec
src/common.cpp
src/common_dev.cpp
src/emuld.cpp
src/mobile.cpp
src/mobile_dev.cpp
src/wearable.cpp
src/wearable_dev.cpp

Change-Id: Ida417052297457f45adc210c68b16fb2be42fe2d

1  2 
packaging/emuld.spec

index 4079b085617f9243c8c4b24558cb14dc8e82be1a,609db3baabfa2ae1a3effd8730b0527515b368b0..70d37c076767f600f15fa6fdacd2eb0b5c07dd0a
@@@ -17,11 -21,7 +21,12 @@@ A emulator daemon is used for communica
  %prep
  %setup -q
  
- %elseif "%{?tizen_profile_name}" == "wearable"
- export CFLAGS+=" -DWEARABLE"
 +%if "%{?tizen_profile_name}" == "mobile"
 +export CFLAGS+=" -DMOBILE"
 +%endif
++#%if "%{?tizen_profile_name}" == "wearable"
+ export CFLAGS+=" -DWEARABLE"
++#%endif
  
  cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}