!270 临时屏蔽selinux导致的文件读取失败问题

Merge pull request !270 from sunyaozu/master
This commit is contained in:
openharmony_ci 2022-07-29 02:32:45 +00:00 committed by Gitee
commit a09b4e6e71
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 5 additions and 5 deletions

View File

@ -164,14 +164,14 @@ ohos_prebuilt_etc("forbidden_regions_xml") {
ohos_prebuilt_etc("lang_supported_locales") {
source = "//base/global/i18n/frameworks/intl/etc/lang/supported_locales.xml"
module_install_dir = "usr/ohos_lang_config/"
module_install_dir = "etc/ohos_lang_config/"
part_name = "i18n"
subsystem_name = "global"
}
ohos_prebuilt_etc("zh_Hans_lang_xml") {
source = "//base/global/i18n/frameworks/intl/etc/lang/zh-Hans.xml"
module_install_dir = "usr/ohos_lang_config/"
module_install_dir = "etc/ohos_lang_config/"
part_name = "i18n"
subsystem_name = "global"
}
@ -185,7 +185,7 @@ ohos_prebuilt_etc("zh_Hans_timezone_xml") {
ohos_prebuilt_etc("en_Latn_lang_xml") {
source = "//base/global/i18n/frameworks/intl/etc/lang/en-Latn.xml"
module_install_dir = "usr/ohos_lang_config/"
module_install_dir = "etc/ohos_lang_config/"
part_name = "i18n"
subsystem_name = "global"
}

View File

@ -59,10 +59,10 @@ const char *LocaleConfig::FORBIDDEN_REGIONS_PATH = "/system/usr/ohos_locale_conf
const char *LocaleConfig::SUPPORTED_LOCALES_PATH = "/system/usr/ohos_locale_config/supported_locales.xml";
const char *LocaleConfig::SUPPORTED_REGIONS_PATH = "/system/usr/ohos_locale_config/supported_regions.xml";
const char *LocaleConfig::WHITE_LANGUAGES_PATH = "/system/usr/ohos_locale_config/white_languages.xml";
const char *LocaleConfig::SUPPORT_LOCALES_PATH = "/system/usr/ohos_lang_config/supported_locales.xml";
const char *LocaleConfig::SUPPORT_LOCALES_PATH = "/etc/ohos_lang_config/supported_locales.xml";
const char *LocaleConfig::DEFAULT_LOCALE = "en-Latn";
const char *LocaleConfig::supportLocalesTag = "supported_locales";
const char *LocaleConfig::LANG_PATH = "/system/usr/ohos_lang_config/";
const char *LocaleConfig::LANG_PATH = "/etc/ohos_lang_config/";
const char *LocaleConfig::rootTag = "languages";
const char *LocaleConfig::secondRootTag = "lang";
unordered_set<string> LocaleConfig::supportedLocales;