diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-05-01 19:46:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-01 19:46:14 +0000 |
| commit | 78d1aad1d561ec58f668f347602ba2aeb3036499 (patch) | |
| tree | 8f601178178963adff0d9a7cc4d1e0354af54b2d | |
| parent | c8d4659fb63e1f44ed32bd3cd1d5fb241dfb0b80 (diff) | |
| parent | 439bbaf6f7bfab12f7e3206467b6d8e450657aea (diff) | |
| download | core-build-tools-release.tar.gz | |
Merge "Snap for 11788943 from 2026332ed854631bf5bfbbcb49e9df98cc7fcc01 to build-tools-release" into build-tools-releasebuild-tools-release
| -rw-r--r-- | init/property_service.cpp | 4 | ||||
| -rw-r--r-- | rootdir/Android.mk | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/init/property_service.cpp b/init/property_service.cpp index 5a1b63b2e..d02ca1e49 100644 --- a/init/property_service.cpp +++ b/init/property_service.cpp @@ -453,6 +453,10 @@ static uint32_t SendControlMessage(const std::string& msg, const std::string& na SocketConnection* socket, std::string* error) { auto lock = std::lock_guard{accept_messages_lock}; if (!accept_messages) { + // If we're already shutting down and you're asking us to stop something, + // just say we did (https://issuetracker.google.com/336223505). + if (msg == "stop") return PROP_SUCCESS; + *error = "Received control message after shutdown, ignoring"; return PROP_ERROR_HANDLE_CONTROL_MESSAGE; } diff --git a/rootdir/Android.mk b/rootdir/Android.mk index fb91b5888..2394b14aa 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -72,9 +72,9 @@ endif EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS := ifeq ($(CLANG_COVERAGE),true) ifeq ($(CLANG_COVERAGE_CONTINUOUS_MODE),true) - EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS := export LLVM_PROFILE_FILE /data/misc/trace/clang%c-%20m.profraw + EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS := export LLVM_PROFILE_FILE /data/local/tmp/clang%c-%20m.profraw else - EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS := export LLVM_PROFILE_FILE /data/misc/trace/clang-%20m.profraw + EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS := export LLVM_PROFILE_FILE /data/local/tmp/clang-%20m.profraw endif endif |