Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76914e52 authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

Merge "Fix DRM prebuilt vendor module handling" into oc-dev

am: fdfb81eb

Change-Id: Ib8cb9c7cca60817256c425ff4c89d60a9109ccb5
parents 14965f95 fdfb81eb
Loading
Loading
Loading
Loading
+6 −2
Original line number Original line Diff line number Diff line
@@ -973,8 +973,12 @@ INSTANTIATE_TEST_CASE_P(
        testing::ValuesIn(gVendorModules->getVendorModulePaths()));
        testing::ValuesIn(gVendorModules->getVendorModulePaths()));


int main(int argc, char** argv) {
int main(int argc, char** argv) {
    gVendorModules =
#if defined(__LP64__)
            new drm_vts::VendorModules("/data/nativetest/drm_hidl_test/vendor");
    const char *kModulePath = "/data/local/tmp/64/lib";
#else
    const char *kModulePath = "/data/local/tmp/32/lib";
#endif
    gVendorModules = new drm_vts::VendorModules(kModulePath);
    ::testing::InitGoogleTest(&argc, argv);
    ::testing::InitGoogleTest(&argc, argv);
    return RUN_ALL_TESTS();
    return RUN_ALL_TESTS();
}
}
−462 KiB

File deleted.