summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tomasz Wasilczyk <twasilczyk@google.com> 2023-10-21 03:21:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-21 03:21:40 +0000
commitfbec5883d555f90cad16dee0e9f84aae81f72650 (patch)
treecbc8c22eb94a87ed884a8a54da954df497dbaceb
parent1aae761f25daca45d9348dc6e8d47bd62104df7b (diff)
parent377dcaa9c5941fc55b7aa330a319d6b04512cae5 (diff)
Merge "Don't include AIDL NDK output if not needed" into main am: 377dcaa9c5
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2795345 Change-Id: Ibe3378229fe9e11e982a690ec069897dab0bb599 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libs/binder/tests/binderRpcTest.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp
index 5884dbe66f..1340ea1d2c 100644
--- a/libs/binder/tests/binderRpcTest.cpp
+++ b/libs/binder/tests/binderRpcTest.cpp
@@ -14,7 +14,10 @@
* limitations under the License.
*/
+#ifndef __ANDROID_VENDOR__
+// only used on NDK tests outside of vendor
#include <aidl/IBinderRpcTest.h>
+#endif
#include <android-base/stringprintf.h>
#include <chrono>