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

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

Merge "libbinder: Include stability.cpp in the Trusty NDK library" into main... 

Merge "libbinder: Include stability.cpp in the Trusty NDK library" into main am: 4e1e221a am: d9cefa98

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



Change-Id: I98fd28d654af16c8de73547d8859fe6f103eb4e2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 195631aa d9cefa98

libs/binder/ndk/stability.cpp

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


using ::android::internal::Stability;



#ifdef __ANDROID_VNDK__

#if defined(__ANDROID_VNDK__) && !defined(__TRUSTY__)

#error libbinder_ndk should only be built in a system context

#endif

libs/binder/trusty/ndk/rules.mk

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ MODULE_SRCS := \ 
	$(LIBBINDER_NDK_DIR)/ibinder.cpp \

	$(LIBBINDER_NDK_DIR)/libbinder.cpp \

	$(LIBBINDER_NDK_DIR)/parcel.cpp \

	$(LIBBINDER_NDK_DIR)/stability.cpp \

	$(LIBBINDER_NDK_DIR)/status.cpp \



MODULE_EXPORT_INCLUDES += \