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

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

Merge "binder: consistent vendor #defines" into main am: 84145b2e 

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



Change-Id: I09d8b07e69ba6cac73f007288283c49ba204e846
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9a465c72 84145b2e

libs/binder/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -258,7 +258,9 @@ cc_defaults { 
        "-DBINDER_DISABLE_NATIVE_HANDLE",

        "-DBINDER_DISABLE_BLOB",

        "-DBINDER_NO_LIBBASE",

        // TODO: switch to "vendor: true" rather than copying this

        // Trusty libbinder uses vendor stability for its binders

        "-D__ANDROID_VENDOR__",

        "-D__ANDROID_VNDK__",

        "-U__ANDROID__",

        "-D__TRUSTY__",

libs/binder/Stability.cpp

+8 −0
Original line number Diff line number Diff line
@@ -73,6 +73,14 @@ void Stability::tryMarkCompilationUnit(IBinder* binder) { 
    (void)setRepr(binder, getLocalLevel(), REPR_NONE);

}



// after deprecation of the VNDK, these should be aliases. At some point

// all references to __ANDROID_VNDK__ should be replaced by __ANDROID_VENDOR__

// but for right now, check that this condition holds because some

// places check __ANDROID_VNDK__ and some places check __ANDROID_VENDOR__

#if defined(__ANDROID_VNDK__) != defined(__ANDROID_VENDOR__)

#error "__ANDROID_VNDK__ and __ANDROID_VENDOR__ should be aliases"

#endif



Stability::Level Stability::getLocalLevel() {

#ifdef __ANDROID_APEX__

#error "APEX can't use libbinder (must use libbinder_ndk)"

libs/binder/trusty/kernel/rules.mk

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ GLOBAL_COMPILEFLAGS += \ 
	-DBINDER_DISABLE_NATIVE_HANDLE \

	-DBINDER_DISABLE_BLOB \

	-DBINDER_NO_LIBBASE \

	-D__ANDROID_VENDOR__ \

	-D__ANDROID_VNDK__ \



MODULE_DEPS += \

libs/binder/trusty/rules.mk

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ MODULE_EXPORT_COMPILEFLAGS += \ 
	-DBINDER_DISABLE_NATIVE_HANDLE \

	-DBINDER_DISABLE_BLOB \

	-DBINDER_NO_LIBBASE \

	-D__ANDROID_VENDOR__ \

	-D__ANDROID_VNDK__ \



# libbinder has some deprecated declarations that we want to produce warnings