Skip to content

Commit 32f5349

Browse files
committed
Revert force put module to its scope
1 parent f623a1d commit 32f5349

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Diff for: edxp-core/src/main/cpp/main/src/config_manager.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ namespace edxp {
226226
while (std::getline(ifs, module)) {
227227
const auto &module_pkg_name = GetPackageNameFromBaseApkPath(module);
228228
auto &[module_path, scope] = modules_list[module_pkg_name];
229-
scope.insert(module_pkg_name); // Always add module itself
230229
module_path.assign(std::move(module));
231230
const auto &module_scope_conf = GetConfigPath(module_pkg_name + ".conf");
232231
if (!path_exists<true>(module_scope_conf)) {
@@ -243,6 +242,8 @@ namespace edxp {
243242
if (!app_pkg_name.empty())
244243
scope.emplace(std::move(app_pkg_name));
245244
}
245+
if (!scope.empty())
246+
scope.insert(module_pkg_name); // Always add module itself
246247
LOGI("scope of %s is:\n %s", module_pkg_name.c_str(), ([&scope = scope]() {
247248
std::ostringstream join;
248249
std::copy(scope.begin(), scope.end(),

0 commit comments

Comments
 (0)