Merge changes from topic "libhidl-test-mapping"
* changes:
Add TEST_MAPPING.
libhidl_test: doesn't require additional binaries
diff --git a/Android.bp b/Android.bp
index fd750fa..b78845c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -29,7 +29,7 @@
srcs: ["test_main.cpp"],
shared_libs: [
- "android.hardware.tests.inheritance@1.0",
+ "android.hidl.memory@1.0",
"libbase",
"libhidlbase",
"libhidltransport",
@@ -40,10 +40,6 @@
],
static_libs: ["libgtest", "libgmock"],
- required: [
- "android.hardware.tests.inheritance@1.0-impl",
- ],
-
cflags: [
"-O0",
"-g",
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..3e17fc4
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+ "presubmit": [
+ {
+ "name": "libhidl_test"
+ }
+ ]
+}
+
diff --git a/test_main.cpp b/test_main.cpp
index 7f80d71..beb89d7 100644
--- a/test_main.cpp
+++ b/test_main.cpp
@@ -17,7 +17,7 @@
#define LOG_TAG "LibHidlTest"
#include <android-base/logging.h>
-#include <android/hardware/tests/inheritance/1.0/IParent.h>
+#include <android/hidl/memory/1.0/IMemory.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <hidl/HidlSupport.h>
@@ -462,12 +462,14 @@
TEST_F(LibHidlTest, PreloadTest) {
using ::android::hardware::preloadPassthroughService;
- using ::android::hardware::tests::inheritance::V1_0::IParent;
+ using ::android::hidl::memory::V1_0::IMemory;
- static const std::string kLib = "android.hardware.tests.inheritance@1.0-impl.so";
+ // installed on all devices by default in both bitnesses and not otherwise a dependency of this
+ // test.
+ static const std::string kLib = "android.hidl.memory@1.0-impl.so";
EXPECT_FALSE(isLibraryOpen(kLib));
- preloadPassthroughService<IParent>();
+ preloadPassthroughService<IMemory>();
EXPECT_TRUE(isLibraryOpen(kLib));
}