| commit | cbccbe7ea28775c99080b68938bf0643ace72b76 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Aug 13 19:23:27 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 13 19:23:27 2024 +0000 |
| tree | 95171c067716e14212bfc1fb4a97aebc7589cee9 | |
| parent | 4d45dc721100a4e84fe12d98928c0a313babe0e5 [diff] | |
| parent | 3a7758d7cffa83905dfd260fc6e8ccf6ec2f4148 [diff] |
Merge "There's now just one <sys/system_properties.h>." into main am: 3a7758d7cf Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3211163 Change-Id: I0a45bd8f9c7366a3c7292bb6df46ac97c68c8006 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index 062fab3..9112d37 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -59,8 +59,7 @@ #include <sys/resource.h> #include <sys/socket.h> #include <sys/stat.h> -#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ -#include <sys/_system_properties.h> +#include <sys/system_properties.h> #include <sys/time.h> #include <sys/types.h> #include <sys/un.h>