Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a8bd42d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Iebdb112c,I8203868b,Icedec8cc 

* changes:
  Update BOOTCLASSPATH environment variable search location
  Only read system/build.prop for properties
  Populate ApexFileRepository before activating apexes
parents 4a9a39c2 9c3d87d4

cmds/installd/otapreopt.cpp

+29 −17
Original line number Original line Diff line number Diff line
@@ -175,8 +175,10 @@ class OTAPreoptService { 
private:

private:





    bool ReadSystemProperties() {

    bool ReadSystemProperties() {

        // TODO This file does not have a stable format. It should be read by

        // code shared by init and otapreopt. See b/181182967#comment80

        static constexpr const char* kPropertyFiles[] = {

        static constexpr const char* kPropertyFiles[] = {

                "/default.prop", "/system/build.prop"

                "/system/build.prop"

        };

        };





        for (size_t i = 0; i < arraysize(kPropertyFiles); ++i) {

        for (size_t i = 0; i < arraysize(kPropertyFiles); ++i) {
@@ -193,8 +195,18 @@ private: 
        //   export NAME VALUE

        //   export NAME VALUE

        // For simplicity, don't respect string quotation. The values we are interested in can be

        // For simplicity, don't respect string quotation. The values we are interested in can be

        // encoded without them.

        // encoded without them.

        // init.environ.rc and etc/classpath have the same format for

        // environment variable exports and can be matched by the same regex.

        // TODO Just like with the system-properties above we really should have

        // common code between init and otapreopt to deal with reading these

        // things. See b/181182967

        static constexpr const char* kEnvironmentVariableSources[] = {

                "/init.environ.rc", "/etc/classpath"

        };



        std::regex export_regex("\\s*export\\s+(\\S+)\\s+(\\S+)");

        std::regex export_regex("\\s*export\\s+(\\S+)\\s+(\\S+)");

        bool parse_result = ParseFile("/init.environ.rc", [&](const std::string& line) {

        for (const char* env_vars_file : kEnvironmentVariableSources) {

            bool parse_result = ParseFile(env_vars_file, [&](const std::string& line) {

                std::smatch export_match;

                std::smatch export_match;

                if (!std::regex_match(line, export_match, export_regex)) {

                if (!std::regex_match(line, export_match, export_regex)) {

                    return true;

                    return true;
@@ -214,7 +226,7 @@ private: 
            if (!parse_result) {

            if (!parse_result) {

                return false;

                return false;

            }

            }



        }

        if (system_properties_.GetProperty(kAndroidDataPathPropertyName) == nullptr) {

        if (system_properties_.GetProperty(kAndroidDataPathPropertyName) == nullptr) {

            return false;

            return false;

        }

        }

cmds/installd/otapreopt_chroot.cpp

+6 −2
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <libdm/dm.h>

#include <libdm/dm.h>

#include <selinux/android.h>

#include <selinux/android.h>





#include <apex_file_repository.h>

#include <apexd.h>

#include <apexd.h>





#include "installd_constants.h"

#include "installd_constants.h"
@@ -64,11 +65,14 @@ static std::vector<apex::ApexFile> ActivateApexPackages() { 
    // system/apex/apexd/apexd.cpp.

    // system/apex/apexd/apexd.cpp.

    //

    //

    // Only scan the APEX directory under /system, /system_ext and /vendor (within the chroot dir).

    // Only scan the APEX directory under /system, /system_ext and /vendor (within the chroot dir).

    std::vector<const char*> apex_dirs{apex::kApexPackageSystemDir, apex::kApexPackageSystemExtDir,

    std::vector<std::string> apex_dirs{apex::kApexPackageSystemDir, apex::kApexPackageSystemExtDir,

                                       apex::kApexPackageVendorDir};

                                       apex::kApexPackageVendorDir};

    // Initialize ApexFileRepository used internally in ScanPackagesDirAndActivate.

    // This is a quick fix to fix apex activation in otapreopt_chroot.

    apex::ApexFileRepository::GetInstance().AddPreInstalledApex(apex_dirs);

    for (const auto& dir : apex_dirs) {

    for (const auto& dir : apex_dirs) {

        // Cast call to void to suppress warn_unused_result.

        // Cast call to void to suppress warn_unused_result.

        static_cast<void>(apex::ScanPackagesDirAndActivate(dir));

        static_cast<void>(apex::ScanPackagesDirAndActivate(dir.c_str()));

    }

    }

    return apex::GetActivePackages();

    return apex::GetActivePackages();

}

}