diff options
| author | Andrei Homescu <ahomescu@google.com> | 2022-09-29 04:26:58 +0000 |
|---|---|---|
| committer | Andrei Homescu <ahomescu@google.com> | 2022-10-07 04:05:17 +0000 |
| commit | 026317b999b4246dd8fa492fd4121b5531894833 (patch) | |
| tree | 10e18c963d3758bf9968f0f49412619fcb2eaf88 | |
| parent | 8eb983cefaa6981865017dc6c9a6879e2145b1f5 (diff) | |
| download | native-026317b999b4246dd8fa492fd4121b5531894833.tar.gz | |
libbinder_ndk: add Trusty build file
Add a rules.mk file to build libbinder_ndk on Trusty.
Bug: 242243245
Test: Trusty binder-test with ndk library added
Change-Id: I1ef4f57aa151d9e1dafb7877391f5bab4bc24c69
| -rw-r--r-- | libs/binder/ndk/include_platform/android/binder_libbinder.h | 2 | ||||
| -rw-r--r-- | libs/binder/trusty/ndk/include/sys/cdefs.h | 24 | ||||
| -rw-r--r-- | libs/binder/trusty/ndk/rules.mk | 38 |
3 files changed, 63 insertions, 1 deletions
diff --git a/libs/binder/ndk/include_platform/android/binder_libbinder.h b/libs/binder/ndk/include_platform/android/binder_libbinder.h index dfe12a1cf7..74a7157314 100644 --- a/libs/binder/ndk/include_platform/android/binder_libbinder.h +++ b/libs/binder/ndk/include_platform/android/binder_libbinder.h @@ -16,7 +16,7 @@ #pragma once -#if !defined(__ANDROID_APEX__) && !defined(__ANDROID_VNDK__) +#if (!defined(__ANDROID_APEX__) && !defined(__ANDROID_VNDK__)) || defined(__TRUSTY__) #include <android/binder_ibinder.h> #include <android/binder_parcel.h> diff --git a/libs/binder/trusty/ndk/include/sys/cdefs.h b/libs/binder/trusty/ndk/include/sys/cdefs.h new file mode 100644 index 0000000000..6a48d2b776 --- /dev/null +++ b/libs/binder/trusty/ndk/include/sys/cdefs.h @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2022 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 + +#include <lk/compiler.h> + +/* Alias the bionic macros to the ones from lk/compiler.h */ +#define __BEGIN_DECLS __BEGIN_CDECLS +#define __END_DECLS __END_CDECLS + +#define __INTRODUCED_IN(x) /* nothing on Trusty */ diff --git a/libs/binder/trusty/ndk/rules.mk b/libs/binder/trusty/ndk/rules.mk new file mode 100644 index 0000000000..03fd006fd2 --- /dev/null +++ b/libs/binder/trusty/ndk/rules.mk @@ -0,0 +1,38 @@ +# Copyright (C) 2021 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. +# + +LOCAL_DIR := $(GET_LOCAL_DIR) + +MODULE := $(LOCAL_DIR) + +LIBBINDER_NDK_DIR := frameworks/native/libs/binder/ndk + +MODULE_SRCS := \ + $(LIBBINDER_NDK_DIR)/ibinder.cpp \ + $(LIBBINDER_NDK_DIR)/libbinder.cpp \ + $(LIBBINDER_NDK_DIR)/parcel.cpp \ + $(LIBBINDER_NDK_DIR)/status.cpp \ + +MODULE_EXPORT_INCLUDES += \ + $(LOCAL_DIR)/include \ + $(LIBBINDER_NDK_DIR)/include_cpp \ + $(LIBBINDER_NDK_DIR)/include_ndk \ + $(LIBBINDER_NDK_DIR)/include_platform \ + +MODULE_LIBRARY_DEPS += \ + trusty/user/base/lib/libstdc++-trusty \ + frameworks/native/libs/binder/trusty \ + +include make/library.mk |