Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbccbe7e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "There's now just one <sys/system_properties.h>." into main am: 3a7758d7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3211163



Change-Id: I0a45bd8f9c7366a3c7292bb6df46ac97c68c8006
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d45dc72 3a7758d7

core/jni/com_android_internal_os_Zygote.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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>