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

Commit e84319e0 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12212122 from 18687b7f to 24Q4-release 

Change-Id: Ie8708db54d9a6e290fe864268c2905b8b044f561
parents bcb7c091 18687b7f

fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.cpp

+1 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <stdio.h>

#include <stdlib.h>

#include <sys/socket.h>

#include <sys/system_properties.h>

#include <sys/types.h>

#include <unistd.h>
@@ -35,9 +36,6 @@ 
#include <snapuserd/snapuserd_client.h>

#include "snapuserd_server.h"



#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_

#include <sys/_system_properties.h>



namespace android {

namespace snapshot {

fs_mgr/tests/AndroidTest.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />

    <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />

    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />

    <option name="config-descriptor:metadata" key="parameter" value="secondary_user_on_secondary_display" />

    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

        <option name="cleanup" value="true" />

        <option name="push" value="CtsFsMgrTestCases->/data/local/tmp/CtsFsMgrTestCases" />

init/init.cpp

+1 −3
Original line number Diff line number Diff line
@@ -26,13 +26,11 @@ 
#include <sys/eventfd.h>

#include <sys/mount.h>

#include <sys/signalfd.h>

#include <sys/system_properties.h>

#include <sys/types.h>

#include <sys/utsname.h>

#include <unistd.h>



#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_

#include <sys/_system_properties.h>



#include <filesystem>

#include <fstream>

#include <functional>

init/property_service.cpp

+1 −3
Original line number Diff line number Diff line
@@ -31,14 +31,12 @@ 
#include <sys/mman.h>

#include <sys/poll.h>

#include <sys/select.h>

#include <sys/system_properties.h>

#include <sys/types.h>

#include <sys/un.h>

#include <unistd.h>

#include <wchar.h>



#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_

#include <sys/_system_properties.h>



#include <map>

#include <memory>

#include <mutex>

init/property_service_test.cpp

+1 −3
Original line number Diff line number Diff line
@@ -16,11 +16,9 @@ 


#include <errno.h>

#include <sys/socket.h>

#include <sys/system_properties.h>

#include <sys/un.h>



#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_

#include <sys/_system_properties.h>



#include <android-base/properties.h>

#include <android-base/scopeguard.h>

#include <android-base/strings.h>