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

Commit f5c0e909 authored by Christopher Ferris's avatar Christopher Ferris
Browse files

Update for kernel headers v5.0.3. 

All of the structures in binder_kernel.h are now in the upstream kernel.

Test: Builds.
Change-Id: I3719b1ca48515170eca5834b1a29f15086441b50
parent ebb52c5a

cmds/servicemanager/binder.h

+1 −2
Original line number Diff line number Diff line
@@ -4,10 +4,9 @@ 
#ifndef _BINDER_H_

#define _BINDER_H_



#include <linux/android/binder.h>

#include <sys/ioctl.h>



#include "binder_kernel.h"



struct binder_state;



struct binder_io

cmds/servicemanager/binder_kernel.h

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

 * Copyright (C) 2019 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.

 */



#ifndef ANDROID_BINDER_KERNEL_H

#define ANDROID_BINDER_KERNEL_H



#include <linux/android/binder.h>



/**

 * This file exists because the uapi kernel headers in bionic are built

 * from upstream kernel headers only, and not all of the hwbinder kernel changes

 * have made it upstream yet. Therefore, the modifications to the

 * binder header are added locally in this file.

 */



enum {

        FLAT_BINDER_FLAG_TXN_SECURITY_CTX = 0x1000,

};



#define BINDER_SET_CONTEXT_MGR_EXT      _IOW('b', 13, struct flat_binder_object)



struct binder_transaction_data_secctx {

        struct binder_transaction_data transaction_data;

        binder_uintptr_t secctx;

};



enum {

        BR_TRANSACTION_SEC_CTX = _IOR('r', 2,

                              struct binder_transaction_data_secctx),

};





#endif // ANDROID_BINDER_KERNEL_H

libs/binder/include/binder/Parcel.h

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#include <string>

#include <vector>



#include <linux/android/binder.h>



#include <android-base/unique_fd.h>

#include <cutils/native_handle.h>

#include <utils/Errors.h>
@@ -28,7 +30,6 @@ 
#include <utils/Vector.h>

#include <utils/Flattenable.h>



#include <binder/binder_kernel.h>

#include <binder/IInterface.h>

#include <binder/Parcelable.h>

#include <binder/Map.h>

libs/binder/include/binder/binder_kernel.h

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

 * Copyright (C) 2016 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.

 */



#ifndef ANDROID_BINDER_KERNEL_H

#define ANDROID_BINDER_KERNEL_H



#include <linux/android/binder.h>



/**

 * This file exists because the uapi kernel headers in bionic are built

 * from upstream kernel headers only, and not all of the hwbinder kernel changes

 * have made it upstream yet. Therefore, the modifications to the

 * binder header are added locally in this file.

 */



enum {

        FLAT_BINDER_FLAG_TXN_SECURITY_CTX = 0x1000,

};



#define BINDER_SET_CONTEXT_MGR_EXT      _IOW('b', 13, struct flat_binder_object)



struct binder_transaction_data_secctx {

        struct binder_transaction_data transaction_data;

        binder_uintptr_t secctx;

};



enum {

        BR_TRANSACTION_SEC_CTX = _IOR('r', 2,

                              struct binder_transaction_data_secctx),

};



#endif // ANDROID_BINDER_KERNEL_H