diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-05-03 20:46:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-03 20:46:02 +0000 |
| commit | c2b543c1362ebb792240d3dddc0bd421abe6a6b2 (patch) | |
| tree | ba380a5af3dad72dd29d03fe90a918152a949f03 | |
| parent | 89aad7ea5ed17f98296fb6171d48eefbf93dc912 (diff) | |
| parent | 1fc367dfb60232cfec4260e6dab286d8c4384ca3 (diff) | |
| download | native-c2b543c1362ebb792240d3dddc0bd421abe6a6b2.tar.gz | |
Merge "libbinder_ndk: Provide a fake llndk-versioning.h header" into main
| -rw-r--r-- | libs/binder/ndk/include_platform/android/binder_manager.h | 5 | ||||
| -rw-r--r-- | libs/binder/trusty/ndk/include/android/llndk-versioning.h | 18 | ||||
| -rw-r--r-- | libs/binder/trusty/ndk/include/sys/cdefs.h | 1 |
3 files changed, 19 insertions, 5 deletions
diff --git a/libs/binder/ndk/include_platform/android/binder_manager.h b/libs/binder/ndk/include_platform/android/binder_manager.h index c665ad82ad..52edae4a38 100644 --- a/libs/binder/ndk/include_platform/android/binder_manager.h +++ b/libs/binder/ndk/include_platform/android/binder_manager.h @@ -18,11 +18,8 @@ #include <android/binder_ibinder.h> #include <android/binder_status.h> -#include <sys/cdefs.h> - -#ifndef __TRUSTY__ #include <android/llndk-versioning.h> -#endif +#include <sys/cdefs.h> __BEGIN_DECLS diff --git a/libs/binder/trusty/ndk/include/android/llndk-versioning.h b/libs/binder/trusty/ndk/include/android/llndk-versioning.h new file mode 100644 index 0000000000..3ae3d8f577 --- /dev/null +++ b/libs/binder/trusty/ndk/include/android/llndk-versioning.h @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2024 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. + */ +#pragma once + +#define __INTRODUCED_IN_LLNDK(x) /* nothing on Trusty */ diff --git a/libs/binder/trusty/ndk/include/sys/cdefs.h b/libs/binder/trusty/ndk/include/sys/cdefs.h index 7528f2bb45..4e9b0e83c6 100644 --- a/libs/binder/trusty/ndk/include/sys/cdefs.h +++ b/libs/binder/trusty/ndk/include/sys/cdefs.h @@ -27,4 +27,3 @@ #endif #define __INTRODUCED_IN(x) /* nothing on Trusty */ -#define __INTRODUCED_IN_LLNDK(x) /* nothing on Trusty */ |