diff options
| author | Hwankyu Jhun <h.jhun@samsung.com> | 2020-08-25 07:51:02 +0900 |
|---|---|---|
| committer | Hwankyu Jhun <h.jhun@samsung.com> | 2020-08-25 07:51:02 +0900 |
| commit | 60648c05194fabf46c690cb89544e41e0c2d9409 (patch) | |
| tree | 2ffdb8e6f09d3297fc6641def98f1583b1841494 | |
| parent | e8fdcd2c341c8329850f2f2a75e37d2ad96e5107 (diff) | |
| download | launchpad-60648c05194fabf46c690cb89544e41e0c2d9409.tar.gz launchpad-60648c05194fabf46c690cb89544e41e0c2d9409.tar.bz2 launchpad-60648c05194fabf46c690cb89544e41e0c2d9409.zip | |
Separate default loader
In 64bit environment(Tizen 64bit IoT), default_arch64.loader.in will be installed
to reduce memory usage.
Change-Id: Ie1201593968541655736cbca4085818dfb982fd1
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
| -rw-r--r-- | packaging/launchpad.spec | 4 | ||||
| -rw-r--r-- | src/loader/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/loader/conf/default_arch32.loader.in (renamed from packaging/default.loader.in) | 0 | ||||
| -rw-r--r-- | src/loader/conf/default_arch64.loader.in | 32 |
4 files changed, 41 insertions, 3 deletions
diff --git a/packaging/launchpad.spec b/packaging/launchpad.spec index 83a9da1..3a1af93 100644 --- a/packaging/launchpad.spec +++ b/packaging/launchpad.spec @@ -50,7 +50,6 @@ Obsoletes: amd-mod-launchpad %define tizen_arch32 0 %endif - %if "%{?_prelink_enable}" == "y" %define tizen_feature_prelink 1 %else @@ -118,6 +117,8 @@ _TIZEN_FEATURE_LOADER_PRIORITY=ON %endif %if 0%{?tizen_arch32} _TIZEN_FEATURE_SET_PERSONALITY_32=ON +%else +_TIZEN_FEATURE_LOADER_ARCH64=ON %endif %if 0%{?tizen_feature_prelink} _TIZEN_FEATURE_PRELINK=ON @@ -130,6 +131,7 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -D_TIZEN_FEATURE_LOADER_PRIORITY:BOOL=${_TIZEN_FEATURE_LOADER_PRIORITY} \ -D_TIZEN_FEATURE_SET_PERSONALITY_32:BOOL=${_TIZEN_FEATURE_SET_PERSONALITY_32} \ -D_TIZEN_FEATURE_PRELINK:BOOL=${_TIZEN_FEATURE_PRELINK} \ + -D_TIZEN_FEATURE_LOADER_ARCH64:BOOL=${_TIZEN_FEATURE_LOADER_ARCH64} \ . %__make %{?_smp_mflags} diff --git a/src/loader/CMakeLists.txt b/src/loader/CMakeLists.txt index 997f034..1dff6be 100644 --- a/src/loader/CMakeLists.txt +++ b/src/loader/CMakeLists.txt @@ -70,5 +70,9 @@ SET_TARGET_PROPERTIES(${LAUNCHPAD_LOADER} ) # remove rpath option that is automatically generated by cmake. INSTALL(TARGETS ${LAUNCHPAD_LOADER} DESTINATION bin) -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/packaging/default.loader.in ${CMAKE_SOURCE_DIR}/packaging/default.loader @ONLY) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/packaging/default.loader DESTINATION share/aul) +IF(_TIZEN_FEATURE_LOADER_ARCH64) +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/conf/default_arch64.loader.in ${CMAKE_CURRENT_SOURCE_DIR}/conf/default.loader @ONLY) +ELSE(_TIZEN_FEATURE_LOADER_ARCH64) +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/conf/default_arch32.loader.in ${CMAKE_CURRENT_SOURCE_DIR}/conf/default.loader @ONLY) +ENDIF(_TIZEN_FEATURE_LOADER_ARCH64) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/conf/default.loader DESTINATION share/aul) diff --git a/packaging/default.loader.in b/src/loader/conf/default_arch32.loader.in index 3e076ce..3e076ce 100644 --- a/packaging/default.loader.in +++ b/src/loader/conf/default_arch32.loader.in diff --git a/src/loader/conf/default_arch64.loader.in b/src/loader/conf/default_arch64.loader.in new file mode 100644 index 0000000..c1fdc92 --- /dev/null +++ b/src/loader/conf/default_arch64.loader.in @@ -0,0 +1,32 @@ +[LOADER] +NAME hw-loader1 +EXE /usr/bin/launchpad-loader +APP_TYPE capp|c++app +HW_ACC ON +DETECTION_METHOD TIMEOUT|VISIBILITY +TIMEOUT 5000 +EXTRA loader_type hw-loader +EXTRA_ARRAY preload +EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/libappcore-efl.so.1 +EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/libappcore-common.so.1 +EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/libcapi-appfw-application.so.0 +EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/ecore_imf/modules/wayland/@EFL_MODULE_VERSION@/module.so +EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/ecore_evas/engines/extn/@EFL_MODULE_VERSION@/module.so +ALTERNATIVE_LOADER common-loader1 + +[LOADER] +NAME common-loader1 +EXE /usr/bin/launchpad-loader +APP_TYPE capp|c++app +DETECTION_METHOD TIMEOUT|VISIBILITY +TIMEOUT 5000 +EXTRA loader_type common-loader +EXTRA_ARRAY preload +EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/libappcore-efl.so.1 +EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/libappcore-common.so.1 +EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/libcapi-appfw-application.so.0 +EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/ecore_imf/modules/wayland/@EFL_MODULE_VERSION@/module.so +EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/ecore_evas/engines/extn/@EFL_MODULE_VERSION@/module.so + + + |