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

Commit a441e2ef authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Stop duplicating <linux/capabilities.h>." into main am: 8d983ee8 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2760169



Change-Id: Ie51e9e5f2cd6d37928a37b0b1bb3870621ac51d3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d545b316 8d983ee8

libcutils/Android.bp

+6 −4
Original line number Diff line number Diff line
@@ -171,11 +171,15 @@ cc_library { 
                "libasync_safe",

            ],

        },

        linux: {

            srcs: [

                "canned_fs_config.cpp",

                "fs_config.cpp",

            ],

        },

        not_windows: {

            srcs: libcutils_nonwindows_sources + [

                "ashmem-host.cpp",

                "canned_fs_config.cpp",

                "fs_config.cpp",

                "trace-host.cpp",

            ],

        },
@@ -201,8 +205,6 @@ cc_library { 
            srcs: libcutils_nonwindows_sources + [

                "android_reboot.cpp",

                "ashmem-dev.cpp",

                "canned_fs_config.cpp",

                "fs_config.cpp",

                "klog.cpp",

                "partition_utils.cpp",

                "qtaguid.cpp",

libcutils/include/private/android_filesystem_capability.h

deleted100644 → 0
+0 −119
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



/*

 * Taken from linux/capability.h, with minor modifications

 */



#ifndef _SYSTEM_CORE_INCLUDE_PRIVATE_ANDROID_FILESYSTEM_CAPABILITY_H

#define _SYSTEM_CORE_INCLUDE_PRIVATE_ANDROID_FILESYSTEM_CAPABILITY_H



#include <stdint.h>



#define __user

#define __u32 uint32_t

#define __le32 uint32_t



#define _LINUX_CAPABILITY_VERSION_1 0x19980330

#define _LINUX_CAPABILITY_U32S_1 1

#define _LINUX_CAPABILITY_VERSION_2 0x20071026

#define _LINUX_CAPABILITY_U32S_2 2

#define _LINUX_CAPABILITY_VERSION_3 0x20080522

#define _LINUX_CAPABILITY_U32S_3 2



typedef struct __user_cap_header_struct {

    __u32 version;

    int pid;

} __user* cap_user_header_t;



typedef struct __user_cap_data_struct {

    __u32 effective;

    __u32 permitted;

    __u32 inheritable;

} __user* cap_user_data_t;



#define VFS_CAP_REVISION_MASK 0xFF000000

#define VFS_CAP_REVISION_SHIFT 24

#define VFS_CAP_FLAGS_MASK ~VFS_CAP_REVISION_MASK

#define VFS_CAP_FLAGS_EFFECTIVE 0x000001

#define VFS_CAP_REVISION_1 0x01000000

#define VFS_CAP_U32_1 1

#define XATTR_CAPS_SZ_1 (sizeof(__le32) * (1 + 2 * VFS_CAP_U32_1))

#define VFS_CAP_REVISION_2 0x02000000

#define VFS_CAP_U32_2 2

#define XATTR_CAPS_SZ_2 (sizeof(__le32) * (1 + 2 * VFS_CAP_U32_2))

#define XATTR_CAPS_SZ XATTR_CAPS_SZ_2

#define VFS_CAP_U32 VFS_CAP_U32_2

#define VFS_CAP_REVISION VFS_CAP_REVISION_2



struct vfs_cap_data {

    __le32 magic_etc;

    struct {

        __le32 permitted;

        __le32 inheritable;

    } data[VFS_CAP_U32];

};



#define _LINUX_CAPABILITY_VERSION _LINUX_CAPABILITY_VERSION_1

#define _LINUX_CAPABILITY_U32S _LINUX_CAPABILITY_U32S_1

#define CAP_CHOWN 0

#define CAP_DAC_OVERRIDE 1

#define CAP_DAC_READ_SEARCH 2

#define CAP_FOWNER 3

#define CAP_FSETID 4

#define CAP_KILL 5

#define CAP_SETGID 6

#define CAP_SETUID 7

#define CAP_SETPCAP 8

#define CAP_LINUX_IMMUTABLE 9

#define CAP_NET_BIND_SERVICE 10

#define CAP_NET_BROADCAST 11

#define CAP_NET_ADMIN 12

#define CAP_NET_RAW 13

#define CAP_IPC_LOCK 14

#define CAP_IPC_OWNER 15

#define CAP_SYS_MODULE 16

#define CAP_SYS_RAWIO 17

#define CAP_SYS_CHROOT 18

#define CAP_SYS_PTRACE 19

#define CAP_SYS_PACCT 20

#define CAP_SYS_ADMIN 21

#define CAP_SYS_BOOT 22

#define CAP_SYS_NICE 23

#define CAP_SYS_RESOURCE 24

#define CAP_SYS_TIME 25

#define CAP_SYS_TTY_CONFIG 26

#define CAP_MKNOD 27

#define CAP_LEASE 28

#define CAP_AUDIT_WRITE 29

#define CAP_AUDIT_CONTROL 30

#define CAP_SETFCAP 31

#define CAP_MAC_OVERRIDE 32

#define CAP_MAC_ADMIN 33

#define CAP_SYSLOG 34

#define CAP_WAKE_ALARM 35

#define CAP_BLOCK_SUSPEND 36

#define CAP_AUDIT_READ 37

#define CAP_LAST_CAP CAP_AUDIT_READ

#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)

#define CAP_TO_INDEX(x) ((x) >> 5)

#define CAP_TO_MASK(x) (1 << ((x)&31))



#undef __user

#undef __u32

#undef __le32



#endif

libcutils/include/private/fs_config.h

+0 −4
Original line number Diff line number Diff line
@@ -24,11 +24,7 @@ 
#include <stdint.h>

#include <sys/cdefs.h>



#if defined(__BIONIC__)

#include <linux/capability.h>

#else  // defined(__BIONIC__)

#include <private/android_filesystem_capability.h>

#endif  // defined(__BIONIC__)



/* Rules for directories and files has moved to system/code/libcutils/fs_config.c */