From c1512c4b3c9419feb9f7bb35ea6c86624df742c2 Mon Sep 17 00:00:00 2001 From: Mu-Woong Lee Date: Tue, 27 Sep 2016 19:22:15 +0900 Subject: [PATCH] Remove unnecessary build macros Change-Id: I5848f82f9426e6d5f26302dabb3e9294d0a9e034 Signed-off-by: Mu-Woong Lee --- packaging/context-provider.spec | 9 +-------- src/battery-stats/HeartDbReader.cpp | 6 +----- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/packaging/context-provider.spec b/packaging/context-provider.spec index af282f9..3d197b0 100644 --- a/packaging/context-provider.spec +++ b/packaging/context-provider.spec @@ -68,10 +68,6 @@ export CXXFLAGS+=" -std=c++0x" #export CFLAGS+=" -Wcast-qual" #export CXXFLAGS+=" -Wcast-qual" -#export CFLAGS+=" -DTIZEN_ENGINEER_MODE" -#export CXXFLAGS+=" -DTIZEN_ENGINEER_MODE" -#export FFLAGS+=" -DTIZEN_ENGINEER_MODE" - cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -DPROFILE=%{?BUILD_PROFILE} make %{?jobs:-j%jobs} @@ -79,9 +75,6 @@ make %{?jobs:-j%jobs} rm -rf %{buildroot} %make_install -mkdir -p %{buildroot}/usr/share/license -cp LICENSE %{buildroot}/usr/share/license/%{name} - %post /sbin/ldconfig @@ -91,9 +84,9 @@ cp LICENSE %{buildroot}/usr/share/license/%{name} %files %manifest packaging/%{name}.manifest %defattr(-,root,root,-) -/usr/share/license/%{name} %{_libdir}/*.so* %{_libdir}/context-service/*.so* +%license LICENSE %package devel Summary: Context Provider Shared Header (Development) diff --git a/src/battery-stats/HeartDbReader.cpp b/src/battery-stats/HeartDbReader.cpp index dcb5efc..5b65b33 100644 --- a/src/battery-stats/HeartDbReader.cpp +++ b/src/battery-stats/HeartDbReader.cpp @@ -15,6 +15,7 @@ */ //#include +#include #include #include "BatteryStatisticsTypes.h" #include "HeartDbReader.h" @@ -24,12 +25,7 @@ #define HEART_TIME "time" #define HEART_DATA "data" -#ifdef LEGACY_FILE_PATH -#define HEART_DB_PATH "/opt/usr/dbspace/.resourced-logging.db" -#else -#include #define HEART_DB_PATH tzplatform_mkpath(TZ_USER_DB, ".resourced-heart-default.db") -#endif using namespace ctx; -- 2.34.1