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

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

Merge "libbinder_ndk: Provide a fake llndk-versioning.h header" into main am:... 

Merge "libbinder_ndk: Provide a fake llndk-versioning.h header" into main am: c2b543c1 am: c5838fa7

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



Change-Id: I0ead816fcc45874bf770afe1b0f8ea6f1c13223a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 610c01d2 c5838fa7

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

+1 −4
Original line number Diff line number Diff line
@@ -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

libs/binder/trusty/ndk/include/android/llndk-versioning.h

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

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

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

+0 −1
Original line number Diff line number Diff line
@@ -27,4 +27,3 @@ 
#endif



#define __INTRODUCED_IN(x) /* nothing on Trusty */
 
#define __INTRODUCED_IN_LLNDK(x) /* nothing on Trusty */