| commit | ec7bff72b7226c57bd085c38d0f4b39867bb5425 | [log] [tgz] |
|---|---|---|
| author | Tomasz Wasilczyk <twasilczyk@google.com> | Sat Oct 21 03:19:21 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 21 03:19:21 2023 +0000 |
| tree | cbc8c22eb94a87ed884a8a54da954df497dbaceb | |
| parent | 167dcb67f49e660f9d1202dd75fb067ea7710a8a [diff] | |
| parent | 44b2212c2ba3334b457e05da84e41a0d0ffa8ffe [diff] |
Merge "Don't include AIDL NDK output if not needed" into main am: 377dcaa9c5 am: 44b2212c2b Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2795345 Change-Id: Idbde78d4ac6e4c819d1a46fd8919a452a88782c1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp index 5884dbe..1340ea1 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>