ScoopDroid/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Use the new 'partition' field in 'ApexInfo' to identify vendor apexes" into main

Browse source
This commit is contained in:
Chan Wang 2024-11-16 11:41:00 +00:00 • committed by Gerrit Code Review
commit c759f23f2f
5 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
init/init.cpp
View file

@ -315,8 +315,7 @@ Parser CreateApexConfigParser(ActionManager& action_manager, ServiceList& servic
if (apex_info_list.has_value()) {
std::vector<std::string> subcontext_apexes;
for (const auto& info : apex_info_list->getApexInfo()) {
if (info.hasPreinstalledModulePath() &&
subcontext->PathMatchesSubcontext(info.getPreinstalledModulePath())) {
if (subcontext->PartitionMatchesSubcontext(info.getPartition())) {
subcontext_apexes.push_back(info.getModuleName());
}
}

11
init/subcontext.cpp
View file

@ -263,6 +263,10 @@ bool Subcontext::PathMatchesSubcontext(const std::string& path) const {
return false;
}
bool Subcontext::PartitionMatchesSubcontext(const std::string& partition) const {
return std::find(partitions_.begin(), partitions_.end(), partition) != partitions_.end();
}
void Subcontext::SetApexList(std::vector<std::string>&& apex_list) {
apex_list_ = std::move(apex_list);
}
@ -352,12 +356,13 @@ void InitializeSubcontext() {
}
if (SelinuxGetVendorAndroidVersion() >= __ANDROID_API_P__) {
subcontext.reset(
new Subcontext(std::vector<std::string>{"/vendor", "/odm"}, kVendorContext));
subcontext.reset(new Subcontext(std::vector<std::string>{"/vendor", "/odm"},
std::vector<std::string>{"VENDOR", "ODM"}, kVendorContext));
}
}
void InitializeHostSubcontext(std::vector<std::string> vendor_prefixes) {
subcontext.reset(new Subcontext(vendor_prefixes, kVendorContext, /*host=*/true));
subcontext.reset(new Subcontext(vendor_prefixes, {}, kVendorContext, /*host=*/true));
}
Subcontext* GetSubcontext() {

6
init/subcontext.h
View file

@ -36,8 +36,10 @@ static constexpr const char kTestContext[] = "test-test-test";
class Subcontext {
public:
Subcontext(std::vector<std::string> path_prefixes, std::string_view context, bool host = false)
Subcontext(std::vector<std::string> path_prefixes, std::vector<std::string> partitions,
std::string_view context, bool host = false)
: path_prefixes_(std::move(path_prefixes)),
partitions_(std::move(partitions)),
context_(context.begin(), context.end()),
pid_(0) {
if (!host) {
@ -49,6 +51,7 @@ class Subcontext {
Result<std::vector<std::string>> ExpandArgs(const std::vector<std::string>& args);
void Restart();
bool PathMatchesSubcontext(const std::string& path) const;
bool PartitionMatchesSubcontext(const std::string& partition) const;
void SetApexList(std::vector<std::string>&& apex_list);
const std::string& context() const { return context_; }
@ -59,6 +62,7 @@ class Subcontext {
Result<SubcontextReply> TransmitMessage(const SubcontextCommand& subcontext_command);
std::vector<std::string> path_prefixes_;
std::vector<std::string> partitions_;
std::vector<std::string> apex_list_;
std::string context_;
pid_t pid_;

2
init/subcontext_benchmark.cpp
View file

@ -33,7 +33,7 @@ static void BenchmarkSuccess(benchmark::State& state) {
return;
}
auto subcontext = Subcontext({"path"}, context);
auto subcontext = Subcontext({"path"}, {"partition"}, context);
free(context);
while (state.KeepRunning()) {

15
init/subcontext_test.cpp
View file

@ -41,7 +41,7 @@ namespace init {
template <typename F>
void RunTest(F&& test_function) {
auto subcontext = Subcontext({"dummy_path"}, kTestContext);
auto subcontext = Subcontext({"dummy_path"}, {"dummy_partition"}, kTestContext);
ASSERT_NE(0, subcontext.pid());
test_function(subcontext);
@ -177,6 +177,19 @@ TEST(subcontext, ExpandArgsFailure) {
});
}
TEST(subcontext, PartitionMatchesSubcontext) {
RunTest([](auto& subcontext) {
static auto& existent_partition = "dummy_partition";
static auto& non_existent_partition = "not_dummy_partition";
auto existent_result = subcontext.PartitionMatchesSubcontext(existent_partition);
auto non_existent_result = subcontext.PartitionMatchesSubcontext(non_existent_partition);
ASSERT_TRUE(existent_result);
ASSERT_FALSE(non_existent_result);
});
}
BuiltinFunctionMap BuildTestFunctionMap() {
// For CheckDifferentPid
auto do_return_pids_as_error = [](const BuiltinArguments& args) -> Result<void> {