diff options
| author | 2023-08-07 17:17:52 +0000 | |
|---|---|---|
| committer | 2023-08-07 17:17:52 +0000 | |
| commit | 3e58525d67d85a0e61bb19ac209f9d64be07452c (patch) | |
| tree | 3ff513ecd97fe94b031be1cdfcec00b2fe50e43a | |
| parent | 2a4cec49d2a7d6dd507bfc0937f18abddc6af666 (diff) | |
| parent | a7675da8c1bc60cddd33f79bf586e6cd5f31519f (diff) | |
Merge "Revert "Update IsStrictRun to be framework-only"" into main am: 0406047e71 am: 643e976523 am: 692f6e380c am: a7675da8c1
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2692527
Change-Id: I9f0551cac780a8469bc2d65587ced4eefebef9cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cmds/dumpstate/DumpstateUtil.cpp | 4 | ||||
| -rw-r--r-- | cmds/dumpstate/DumpstateUtil.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/cmds/dumpstate/DumpstateUtil.cpp b/cmds/dumpstate/DumpstateUtil.cpp index 484231225d..615701ccc1 100644 --- a/cmds/dumpstate/DumpstateUtil.cpp +++ b/cmds/dumpstate/DumpstateUtil.cpp @@ -207,9 +207,7 @@ std::string PropertiesHelper::build_type_ = ""; int PropertiesHelper::dry_run_ = -1; int PropertiesHelper::unroot_ = -1; int PropertiesHelper::parallel_run_ = -1; -#if !defined(__ANDROID_VNDK__) int PropertiesHelper::strict_run_ = -1; -#endif bool PropertiesHelper::IsUserBuild() { if (build_type_.empty()) { @@ -240,7 +238,6 @@ bool PropertiesHelper::IsParallelRun() { return parallel_run_ == 1; } -#if !defined(__ANDROID_VNDK__) bool PropertiesHelper::IsStrictRun() { if (strict_run_ == -1) { // Defaults to using stricter timeouts. @@ -248,7 +245,6 @@ bool PropertiesHelper::IsStrictRun() { } return strict_run_ == 1; } -#endif int DumpFileToFd(int out_fd, const std::string& title, const std::string& path) { android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(path.c_str(), O_RDONLY | O_NONBLOCK | O_CLOEXEC))); diff --git a/cmds/dumpstate/DumpstateUtil.h b/cmds/dumpstate/DumpstateUtil.h index 6049e3e19d..9e955e3c04 100644 --- a/cmds/dumpstate/DumpstateUtil.h +++ b/cmds/dumpstate/DumpstateUtil.h @@ -198,18 +198,14 @@ class PropertiesHelper { * will default to true. This results in shortened timeouts for flaky * sections. */ -#if !defined(__ANDROID_VNDK__) static bool IsStrictRun(); -#endif private: static std::string build_type_; static int dry_run_; static int unroot_; static int parallel_run_; -#if !defined(__ANDROID_VNDK__) static int strict_run_; -#endif }; /* |