From 682e7f22c6f726e098d21bdd019fea40e04a8a6d Mon Sep 17 00:00:00 2001 From: wchang kim Date: Tue, 9 Apr 2019 16:25:04 +0900 Subject: [PATCH] Sync 20190409. Change-Id: I86a73bbeac171aa279d303e18dbfc16129411074 --- config-sdk/base_url.config | 4 +- config-sdk/rs_resource/EFL/etc/efl-rs.xml | 1 + .../NativeAPI/capi-system-device-rs.xml | 1 + .../NativeAPI/capi-ui-autofill-rs.xml | 45 +++++++++++++++++++ .../Vulkan-LoaderAndValidationLayers-rs.xml | 18 -------- .../rs_resource/OSS/baserpm/libcurl-rs.xml | 1 + .../rs_resource/OSS/baserpm/openssl-rs.xml | 12 ++--- .../rs_resource/OSS/vulkan-loader-rs.xml | 21 +++++++++ config-sdk/script/rootstrap_plugin_gen_1.0.sh | 5 +++ 9 files changed, 82 insertions(+), 26 deletions(-) mode change 100644 => 100755 config-sdk/rs_resource/EFL/etc/efl-rs.xml mode change 100644 => 100755 config-sdk/rs_resource/NativeAPI/capi-system-device-rs.xml create mode 100755 config-sdk/rs_resource/NativeAPI/capi-ui-autofill-rs.xml delete mode 100644 config-sdk/rs_resource/OSS/Vulkan-LoaderAndValidationLayers-rs.xml mode change 100644 => 100755 config-sdk/rs_resource/OSS/baserpm/libcurl-rs.xml mode change 100644 => 100755 config-sdk/rs_resource/OSS/baserpm/openssl-rs.xml create mode 100755 config-sdk/rs_resource/OSS/vulkan-loader-rs.xml diff --git a/config-sdk/base_url.config b/config-sdk/base_url.config index 6061b3b..4436881 100644 --- a/config-sdk/base_url.config +++ b/config-sdk/base_url.config @@ -5,5 +5,5 @@ #tizen 5.0 M2 RS_RESOURCE="rs_resource" -BASE_REPO="http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/" -PLATFORM_REPO="http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/" +BASE_REPO="http://download.tizen.org/snapshots/tizen/base/latest" +PLATFORM_REPO="http://download.tizen.org/snapshots/tizen/unified/latest" diff --git a/config-sdk/rs_resource/EFL/etc/efl-rs.xml b/config-sdk/rs_resource/EFL/etc/efl-rs.xml old mode 100644 new mode 100755 index d9673cd..f235686 --- a/config-sdk/rs_resource/EFL/etc/efl-rs.xml +++ b/config-sdk/rs_resource/EFL/etc/efl-rs.xml @@ -11,6 +11,7 @@ /usr/include/efl-1/Efl_Config.h /usr/include/efl-1/Efl.h + /usr/include/efl-1/Efl_MVVM_Common.h /usr/include/efl-1/interfaces/* diff --git a/config-sdk/rs_resource/NativeAPI/capi-system-device-rs.xml b/config-sdk/rs_resource/NativeAPI/capi-system-device-rs.xml old mode 100644 new mode 100755 index 172a96c..fec613b --- a/config-sdk/rs_resource/NativeAPI/capi-system-device-rs.xml +++ b/config-sdk/rs_resource/NativeAPI/capi-system-device-rs.xml @@ -20,6 +20,7 @@ /usr/include/device/led.h /usr/include/device/power.h /usr/include/device/ir.h + /usr/include/device/temperature.h /usr/lib/libcapi-system-device.so* /usr/include/device diff --git a/config-sdk/rs_resource/NativeAPI/capi-ui-autofill-rs.xml b/config-sdk/rs_resource/NativeAPI/capi-ui-autofill-rs.xml new file mode 100755 index 0000000..bca946a --- /dev/null +++ b/config-sdk/rs_resource/NativeAPI/capi-ui-autofill-rs.xml @@ -0,0 +1,45 @@ + + + sehwan@samsung.com + jihoon48.kim@samsung.com + inhong1.kim@samsung.com + dalton.lee@samsung.com + sungwook79.park@samsung.com + + + + + + + + + + + + + + + + + + + + + + /usr/include/autofill_common.h + /usr/include/autofill.h + /usr/include/autofill_service.h + /usr/include/autofill_error.h + /usr/include/autofill_manager.h + /usr/lib/libcapi-ui-autofill-common.so* + /usr/lib/libcapi-ui-autofill-manager.so* + /usr/lib/libcapi-ui-autofill-service.so* + /usr/lib/libcapi-ui-autofill.so* + + /usr/include + /usr/lib + libcapi-ui-autofill.so + libcapi-ui-autofill-common.so + libcapi-ui-autofill-manager.so + libcapi-ui-autofill-service.so + diff --git a/config-sdk/rs_resource/OSS/Vulkan-LoaderAndValidationLayers-rs.xml b/config-sdk/rs_resource/OSS/Vulkan-LoaderAndValidationLayers-rs.xml deleted file mode 100644 index dd07a93..0000000 --- a/config-sdk/rs_resource/OSS/Vulkan-LoaderAndValidationLayers-rs.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - lsj119@samsung.com - kk.moon@samsung.com - - - - - - - - - - * - - /usr/include/vulkan - /usr/lib - diff --git a/config-sdk/rs_resource/OSS/baserpm/libcurl-rs.xml b/config-sdk/rs_resource/OSS/baserpm/libcurl-rs.xml old mode 100644 new mode 100755 index 8c2077d..06832e0 --- a/config-sdk/rs_resource/OSS/baserpm/libcurl-rs.xml +++ b/config-sdk/rs_resource/OSS/baserpm/libcurl-rs.xml @@ -17,6 +17,7 @@ /usr/include/curl/stdcheaders.h /usr/include/curl/system.h /usr/include/curl/typecheck-gcc.h + /usr/include/curl/urlapi.h /usr/lib/libcurl.so* /usr/include diff --git a/config-sdk/rs_resource/OSS/baserpm/openssl-rs.xml b/config-sdk/rs_resource/OSS/baserpm/openssl-rs.xml old mode 100644 new mode 100755 index ba30960..835e0be --- a/config-sdk/rs_resource/OSS/baserpm/openssl-rs.xml +++ b/config-sdk/rs_resource/OSS/baserpm/openssl-rs.xml @@ -1,14 +1,14 @@ - - - + + + - - - + + + * diff --git a/config-sdk/rs_resource/OSS/vulkan-loader-rs.xml b/config-sdk/rs_resource/OSS/vulkan-loader-rs.xml new file mode 100755 index 0000000..df20737 --- /dev/null +++ b/config-sdk/rs_resource/OSS/vulkan-loader-rs.xml @@ -0,0 +1,21 @@ + + + lsj119@samsung.com + sc1.lim@samsung.com + joonbum.ko@samsung.com + + + + + + + + + + + + * + + /usr/include/vulkan + /usr/lib + diff --git a/config-sdk/script/rootstrap_plugin_gen_1.0.sh b/config-sdk/script/rootstrap_plugin_gen_1.0.sh index 6089ee4..bfd663a 100755 --- a/config-sdk/script/rootstrap_plugin_gen_1.0.sh +++ b/config-sdk/script/rootstrap_plugin_gen_1.0.sh @@ -97,6 +97,11 @@ then GCC_VERSION="6.2" LLVM_VERSION="4.0" fi +if [[ "${PLATFORM_VERSION}" = "5.5"* ]] +then + GCC_VERSION="6.2" + LLVM_VERSION="4.0" +fi # Deprecated LLVM version #xmlstarlet ed -L -s "/extension/rootstrap" -t elem -n "toolchain" -v "" $PLUGIN_FILENAME #xmlstarlet ed -L -s "/extension/rootstrap/toolchain[last()]" -t attr -n "name" -v "llvm" $PLUGIN_FILENAME -- 2.34.1