Separate app_resource_manager API from capi-appfw-application

app_resource_manager API doesn't have to depend on UI.
Therefore, it should be separated from capi-appfw-application

Change-Id: Ibb2e4c4aa54bcd57bc949723b667319a9f4d6958
Signed-off-by: Inkyun Kil <inkyun.kil@samsung.com>

diff --git a/app_common/CMakeLists.txt b/app_common/CMakeLists.txt
index 2aaf28c16f843799c520021ab240d2fb1824c426..0c2506ac0cb378bfe43c82a19c9db40a784096e8 100644 (file)
--- a/app_common/CMakeLists.txt
+++ b/app_common/CMakeLists.txt
@@ -36,6 +36,7 @@ add_library(${fw_name} SHARED
                app_error.c
                app_finalizer.c
                app_event.c
+               app_resource_manager.c
                )
 
 TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS})

diff --git a/app_common/app_resource_manager.c b/app_common/app_resource_manager.c
new file mode 100644 (file)
index 0000000..f7f5ba0
--- /dev/null
+++ b/app_common/app_resource_manager.c
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <aul_rsc_mgr.h>
+#include "app_resource_manager.h"
+
+int app_resource_manager_init()
+{
+       return aul_resource_manager_init();
+}
+
+int app_resource_manager_get(app_resource_e type, const char *id, char **path)
+{
+       return aul_resource_manager_get((aul_resource_e)type, id, path);
+}
+
+int app_resource_manager_release()
+{
+       return aul_resource_manager_release();
+}
+

diff --git a/packaging/capi-appfw-application.spec b/packaging/capi-appfw-application.spec
index 8e42a43f439ae5f88ee1611aca3866e66b7d726b..92a24ba497f1e3797cd5020a97c8cc46bc174db5 100644 (file)
--- a/packaging/capi-appfw-application.spec
+++ b/packaging/capi-appfw-application.spec
@@ -154,7 +154,6 @@ cp LICENSE %{buildroot}%{_datadir}/license/%{name}
 %{_includedir}/appfw/app.h
 %{_includedir}/appfw/app_internal.h
 %{_includedir}/appfw/app_extension.h
-%{_includedir}/appfw/app_resource_manager.h
 %{_includedir}/appfw/app_i18n.h
 %{_libdir}/pkgconfig/capi-appfw-application.pc
 %{_libdir}/libcapi-appfw-application.so
@@ -170,6 +169,7 @@ cp LICENSE %{buildroot}%{_datadir}/license/%{name}
 %manifest %{name}.manifest
 %{_includedir}/appfw/app_common.h
 %{_includedir}/appfw/app_types.h
+%{_includedir}/appfw/app_resource_manager.h
 %{_libdir}/pkgconfig/capi-appfw-app-common.pc
 %{_libdir}/libcapi-appfw-app-common.so
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5589fd524fdb1b49a248c8d1cc8e07c424c7914e..426b9973c4643f546b619bbdfae9c5bfc2a04932 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,7 +35,6 @@ ADD_LIBRARY(${fw_name} SHARED
        app_main.c
        app_main_legacy.c
        app_resource.c
-       app_resource_manager.c
        i18n.c
        )
 

diff --git a/src/app_resource_manager.c b/src/app_resource_manager.c
deleted file mode 100644 (file)
index f7f5ba0..0000000
--- a/src/app_resource_manager.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <aul_rsc_mgr.h>
-#include "app_resource_manager.h"
-
-int app_resource_manager_init()
-{
-       return aul_resource_manager_init();
-}
-
-int app_resource_manager_get(app_resource_e type, const char *id, char **path)
-{
-       return aul_resource_manager_get((aul_resource_e)type, id, path);
-}
-
-int app_resource_manager_release()
-{
-       return aul_resource_manager_release();
-}
-