diff options
| -rw-r--r-- | cmds/servicemanager/binder.h | 3 | ||||
| -rw-r--r-- | cmds/servicemanager/binder_kernel.h | 46 | ||||
| -rw-r--r-- | libs/binder/include/binder/Parcel.h | 3 | ||||
| -rw-r--r-- | libs/binder/include/binder/binder_kernel.h | 45 |
4 files changed, 3 insertions, 94 deletions
diff --git a/cmds/servicemanager/binder.h b/cmds/servicemanager/binder.h index 70be3b4687..a9ccc74130 100644 --- a/cmds/servicemanager/binder.h +++ b/cmds/servicemanager/binder.h @@ -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 diff --git a/cmds/servicemanager/binder_kernel.h b/cmds/servicemanager/binder_kernel.h deleted file mode 100644 index 19fd773887..0000000000 --- a/cmds/servicemanager/binder_kernel.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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 diff --git a/libs/binder/include/binder/Parcel.h b/libs/binder/include/binder/Parcel.h index afdfe4f6d3..e5219a5590 100644 --- a/libs/binder/include/binder/Parcel.h +++ b/libs/binder/include/binder/Parcel.h @@ -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> diff --git a/libs/binder/include/binder/binder_kernel.h b/libs/binder/include/binder/binder_kernel.h deleted file mode 100644 index c7f6b4b4e6..0000000000 --- a/libs/binder/include/binder/binder_kernel.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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 |