openharmony/drivers_framework
1
0
Fork 0
mirror of https://github.com/openharmony/drivers_framework.git synced 2026-08-27 02:42:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

!972 fix:optimization process startup configuration is not generated according to musl

Browse Source 
Merge pull request !972 from Zhang/master
This commit is contained in:
openharmony_ci
2022-05-12 01:53:05 +00:00
committed by Gitee
parent 0c8cf42b91 6da2be9255
commit a936d92ef9
2 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/hc-gen/src/startup_cfg_gen.cpp
+2 -29
View File
@@ -32,10 +32,6 @@ static constexpr const char *SERVICE_TOP =
" {\n"
" \"name\" : ";
static constexpr const char *PATH_INFO = " \"path\" : [\"/vendor/bin/hdf_devhost\", ";
static constexpr const char *UID_INFO_ROOT =
" \"uid\" : \"root\",\n"
" \"gid\" : [\"system\"]\n"
" }";
static constexpr const char *UID_INFO = " \"uid\" : ";
static constexpr const char *GID_INFO = " \"gid\" : [";
static constexpr const char *CAPS_INFO = " \"caps\" : [";
@@ -85,9 +81,6 @@ bool StartupCfgGen::Initialize()
}
outFileName = Util::File::StripSuffix(outFileName).append(".cfg");
outFileName_ = Util::File::FileNameBase(outFileName);
if (outFileName_.find("musl") != std::string::npos) {
useMusl = true;
}
ofs_.open(outFileName, std::ofstream::out | std::ofstream::binary);
if (!ofs_.is_open()) {
@@ -100,7 +93,7 @@ bool StartupCfgGen::Initialize()
return true;
}
void StartupCfgGen::HostInfoOutputMusl(const std::string &name, bool end)
void StartupCfgGen::HostInfoOutput(const std::string &name, bool end)
{
ofs_ << SERVICE_TOP << "\"" << name << "\",\n";
if (hostInfoMap_[name].dynamicLoad) {
@@ -120,22 +113,6 @@ void StartupCfgGen::HostInfoOutputMusl(const std::string &name, bool end)
ofs_ << '\n';
}
void StartupCfgGen::HostInfoOutput(const std::string &name, bool end)
{
std::string out = SERVICE_TOP;
out.append("\"").append(name).append("\",\n");
if (hostInfoMap_[name].dynamicLoad) {
out.append(DYNAMIC_INFO);
}
out.append(PATH_INFO).append("\"").append(std::to_string(hostInfoMap_[name].hostId)).append("\"").append(", ");
out.append("\"").append(name).append("\"").append("],\n");
out.append(UID_INFO_ROOT);
if (!end) {
out.append(",");
}
ofs_ << out << '\n';
}
void StartupCfgGen::InitHostInfo(HostInfo &hostData)
{
hostData.dynamicLoad = true;
@@ -178,11 +155,7 @@ void StartupCfgGen::HostInfosOutput()
if (cnt == size) {
end = true;
}
if (useMusl) {
HostInfoOutputMusl(it->first, end);
} else {
HostInfoOutput(it->first, end);
}
HostInfoOutput(it->first, end);
}
}
tools/hc-gen/src/startup_cfg_gen.h
-3
View File
@@ -51,8 +51,6 @@ private:
void HostInfoOutput(const std::string &name, bool end);
void HostInfoOutputMusl(const std::string &name, bool end);
void HeaderTopOutput();
void HeaderBottomOutput();
@@ -65,7 +63,6 @@ private:
std::ofstream ofs_;
std::string outFileName_;
bool useMusl = false;
std::map<std::string, HostInfo> hostInfoMap_;
};
} // namespace Hardware