libbinder_ndk: make test work w/ TEST_MAPPING
Since it was broken.
This was two modules, but it's better to make it one (and fork w/
PR_SET_PDEATHSIG so that the test doesn't get into a bad state).
Test: libbinder_ndk_unit_test
Change-Id: I928fe70b401f7c523f664c898f882afe08aec741
diff --git a/libs/binder/ndk/test/Android.bp b/libs/binder/ndk/test/Android.bp
index daaaa5a..062cdb6 100644
--- a/libs/binder/ndk/test/Android.bp
+++ b/libs/binder/ndk/test/Android.bp
@@ -56,16 +56,10 @@
// specifically the parts which are outside of the NDK. Actual users should
// also instead use AIDL to generate these stubs. See android.binder.cts.
cc_test {
- name: "libbinder_ndk_test_client",
+ name: "libbinder_ndk_unit_test",
defaults: ["test_libbinder_ndk_test_defaults"],
- srcs: ["main_client.cpp"],
-}
-
-cc_test {
- name: "libbinder_ndk_test_server",
- defaults: ["test_libbinder_ndk_test_defaults"],
- srcs: ["main_server.cpp"],
- gtest: false,
+ srcs: ["libbinder_ndk_unit_test.cpp"],
+ test_suites: ["general-tests"],
}
cc_test {