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

Commit 93b26375 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "StartsWith/EndsWith allow std::string prefixes/suffixes now." am: 2aa4cc4f am: af24c0d2 

am: 3601d3af

Change-Id: Ib8547528ba82613b192fd1967af170739d79bbe5
parents 1748d427 3601d3af

cmds/installd/dexopt.cpp

+1 −1
Original line number Diff line number Diff line
@@ -963,7 +963,7 @@ static std::string replace_file_extension(const std::string& oat_path, const std 
  if (EndsWith(oat_path, ".dex")) {

    std::string new_path = oat_path;

    new_path.replace(new_path.length() - strlen(".dex"), strlen(".dex"), new_ext);

    CHECK(EndsWith(new_path, new_ext.c_str()));

    CHECK(EndsWith(new_path, new_ext));

    return new_path;

  }

cmds/installd/otapreopt.cpp

+1 −1
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ private: 
        //        backs to do weird things.)

        const char* apk_path = package_parameters_.apk_path;

        CHECK(apk_path != nullptr);

        if (StartsWith(apk_path, android_root_.c_str())) {

        if (StartsWith(apk_path, android_root_)) {

            const char* last_slash = strrchr(apk_path, '/');

            if (last_slash != nullptr) {

                std::string path(apk_path, last_slash - apk_path + 1);