From ed78a1f6644e4017f832683d251049382be5ac40 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Tue, 1 Dec 2020 01:28:48 +0000 Subject: [PATCH] sdk.atree += libbinder_ndk C++ helpers libbinder_ndk includes a set of C++ headers which are for all practical purposes coupled with the AIDL compiler. Since NDK and SDK releases do not line up, and some developers are known to use even old versions of the SDK with the newest NDK, subtle C++ changes to this library may break compatibility with the aidl compiler. Both to reduce the possibility we accidentally break developers as well as increase the types of changes that can be made, the plan is to always ship libbinder_ndk C++ headers alongside AIDL. In the future, this will come with a removal of these headers from the NDK (with error messages pointing developers to use the version that is built and tested with their version of aidl). Bug: 160624671 Test: 'm sdk' and verify contents in out/host/*/sdk/sdk/** Change-Id: I6dcdfce5314863663548f0a4523df6e96448ee23 --- build/sdk.atree | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/sdk.atree b/build/sdk.atree index 7392707fc..e522e5de2 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -177,6 +177,8 @@ ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android.test.runner.stubs_intermedia # the aidl precompiled include ${OUT_DIR}/target/common/obj/PACKAGING/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl +# the libbinder_ndk C++ library files associated with the AIDL compiler +frameworks/native/libs/binder/ndk/include_cpp/ platforms/${PLATFORM_NAME}/optional/libbinder_ndk_cpp/ # emulator skins from sdk.git development/tools/emulator/skins/QVGA platforms/${PLATFORM_NAME}/skins/QVGA