summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jiakai Zhang <jiakaiz@google.com> 2023-09-01 14:42:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-01 14:42:04 +0000
commit9296e9adeb2f26adb56c56522ab468635a11743e (patch)
tree2ac19af321b0cadf5279f6b009effcfbcaefe9ef
parent708e60d2d6493e4f5469086cd3bc932f0720333d (diff)
parent945391badd30e242f0ca216887954d7b9ac769b8 (diff)
Merge "Fix string comparison in otapreopt." into main am: ad357667e3 am: dfcb2791eb am: a523ea01e0 am: 945391badd
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2736396 Change-Id: Ib4ec2fba0f589392e76562c27cce7af5b079a3c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--cmds/installd/otapreopt.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp
index 27ae8f6e6f..a447cda492 100644
--- a/cmds/installd/otapreopt.cpp
+++ b/cmds/installd/otapreopt.cpp
@@ -422,7 +422,8 @@ private:
bool IsAotCompilation() const {
if (std::find(std::begin(kAotCompilerFilters), std::end(kAotCompilerFilters),
- parameters_.compiler_filter) == std::end(kAotCompilerFilters)) {
+ std::string_view(parameters_.compiler_filter)) ==
+ std::end(kAotCompilerFilters)) {
return false;
}