From 7e2d1beb3cfa1b85f3e7ef7bedc5afa29ca83ee7 Mon Sep 17 00:00:00 2001 From: Kevin Jeon Date: Fri, 28 Jul 2023 18:37:32 -0400 Subject: Update IsStrictRun to be framework-only This change guards IsStrictRun using __ANDROID_VNDK__ to avoid needing to update the prebuilt ABI dumps in internal, since IsStrictRun is only needed in the framework and does not need to be made available to vendors. This avoids updating the API surface unnecessarily. Test: Cherry-pick this change to internal and verify that internal builds work without needing to update the prebuilt ABI dumps. Ignore-AOSP-First: This is already in AOSP, but needs to be cherry-picked here first before being removed from AOSP. Bug: 283326935 Change-Id: I9dfdf3306b6a9b0faa9f8f7871b1fc244bde1a97 --- cmds/dumpstate/DumpstateUtil.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'cmds/dumpstate/DumpstateUtil.cpp') 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))); -- cgit v1.2.3-59-g8ed1b