Signed-off-by: HanSY <hansiyuan1@huawei.com>
This commit is contained in:
HanSY
2024-12-09 11:38:19 +08:00
parent 06972263b8
commit ec486b34df
30 changed files with 516 additions and 199 deletions
+2 -8
View File
@@ -25,8 +25,8 @@ namespace OHOS {
namespace Global {
namespace Restool {
using namespace std;
IResourceCompiler::IResourceCompiler(ResType type, const string &output)
:type_(type), output_(output)
IResourceCompiler::IResourceCompiler(ResType type, const string &output, bool isOverlap)
:type_(type), output_(output), isOverlap_(isOverlap)
{
}
@@ -104,11 +104,6 @@ const map<pair<ResType, string>, vector<ResourceItem>> &IResourceCompiler::GetRe
return nameInfos_;
}
void IResourceCompiler::SetHapRes(bool state)
{
hapRes_ = state;
}
void IResourceCompiler::SetModuleName(const string &moduleName)
{
moduleName_ = moduleName;
@@ -157,7 +152,6 @@ bool IResourceCompiler::MergeResourceItem(const ResourceItem &resourceItem)
cerr << "but declare again." << NEW_LINE_PATH << resourceItem.GetFilePath() << endl;
return false;
}
nameInfos_[make_pair(resourceItem.GetResType(), idName)].push_back(resourceItem);
return true;
}