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

Commit 1e1d7b60 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder_ndk: add Trusty build file" am: 50da0077 am: 009e464c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2237165



Change-Id: I5887469467c9ded2805bd043b76b2997980c3ff8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b89ecb4 009e464c

libs/binder/ndk/include_platform/android/binder_libbinder.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 




#pragma once

#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_ibinder.h>

#include <android/binder_parcel.h>

#include <android/binder_parcel.h>

libs/binder/trusty/ndk/include/sys/cdefs.h

0 → 100644
+24 −0
Original line number Original line Diff line number Diff line 
/*

 * 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 */

libs/binder/trusty/ndk/rules.mk

0 → 100644
+38 −0
Original line number Original line Diff line number Diff line 
# 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