commit 3c75dff2ebc4f0aa2abe66cd4b13baf3224475b8
author Maciej Żenczykowski <maze@google.com> Fri Apr 29 21:21:46 2022 +0000
committer Maciej Żenczykowski <maze@google.com> Fri Apr 29 21:23:30 2022 +0000
tree b99aaa9c0326686f6ae2bc72338a053c1c95338e
parent 134d5ec8841030c916e35604ef81071994f2bda0

remove spurious ifdef POSIX_SPAWN_CLOEXEC_DEFAULT

(due to automerge to sc-mainline-prod being turned off,
and tm-dev already having this #define'd)

Test: N/A, trivial, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ibf18b2c414f4916301476aa715ef465c8a98ec99

service/jni/com_android_server_connectivity_ClatCoordinator.cpp

diff --git a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
index ba836b2..e2c5a63 100644
--- a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
+++ b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
@@ -315,10 +315,7 @@
 
     // TODO: use android::base::ScopeGuard.
     if (int ret = posix_spawnattr_setflags(&attr, POSIX_SPAWN_USEVFORK
-#ifdef POSIX_SPAWN_CLOEXEC_DEFAULT
-                                           | POSIX_SPAWN_CLOEXEC_DEFAULT
-#endif
-                                           )) {
+                                           | POSIX_SPAWN_CLOEXEC_DEFAULT)) {
         posix_spawnattr_destroy(&attr);
         throwIOException(env, "posix_spawnattr_setflags failed", ret);
         return -1;