diff options
| author | 2023-08-01 22:18:53 +0000 | |
|---|---|---|
| committer | 2023-08-01 22:18:53 +0000 | |
| commit | ed8748a026385cd0ec67f2334698e13a06fa564d (patch) | |
| tree | 098f1f78ddc9cb17618cd467d2a3d728ee8597c3 | |
| parent | 3083f0777d3ad77fe7be1e617e2fdd475c5cc741 (diff) | |
| parent | 5e060dac884bf306f425cc32bab0655407c8f3ca (diff) | |
Merge "Update IsStrictRun to be framework-only" into main am: ab3dc0fdb5 am: f8910058dc am: c8512d680d am: 5e060dac88
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2681060
Change-Id: I2fd8966b863a7cd9ee98f6a2092f275060ef9194
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, 8 insertions, 0 deletions
diff --git a/cmds/dumpstate/DumpstateUtil.cpp b/cmds/dumpstate/DumpstateUtil.cpp index 615701ccc1..484231225d 100644 --- a/cmds/dumpstate/DumpstateUtil.cpp +++ b/cmds/dumpstate/DumpstateUtil.cpp @@ -207,7 +207,9 @@ 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()) { @@ -238,6 +240,7 @@ bool PropertiesHelper::IsParallelRun() { return parallel_run_ == 1; } +#if !defined(__ANDROID_VNDK__) bool PropertiesHelper::IsStrictRun() { if (strict_run_ == -1) { // Defaults to using stricter timeouts. @@ -245,6 +248,7 @@ 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 9e955e3c04..6049e3e19d 100644 --- a/cmds/dumpstate/DumpstateUtil.h +++ b/cmds/dumpstate/DumpstateUtil.h @@ -198,14 +198,18 @@ 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 }; /* |